If they don’t know how to solve conflicts do you think that they know the difference between merge or rebase?
If they don’t know how to solve conflicts do you think that they know the difference between merge or rebase?
You pull the origin to your fork and solve the conflicts one by one, that’s usually how it goes.
If you want to keep your files how they are you can select “accept local changes” instead of “accept incoming changes”. That’s it.
Edit: If you need something more detailed let me know, I am assuming you are using an IDE like VSCode
If it was intended but not properly documented as it says, why does it keep being called a bug?
Imagine having the guts of using a command with “–purge” without reading documentation and blaming others because you’re just lazy.
Maybe just install a distro that don’t let you do that, OP. Have you considered getting a Mac?
We recently purchased the family plan even if it is quite expensive for a couple. Reading this of course made me feel better about it.
I’m curious about the apps now lol
Can’t say anything about privacy because I haven’t used their stuff enough, however I have an iPad from 2013 in perfect state that it useless because I can’t install anything on it.
I’m currently running GrapheneOS on a Pixel 8 Pro. I use the provided sandboxed google services because of some apps (banking, etc). I use F-Droid for most of my needs. I don’t understand what you mean by misleading advertising.
We are currently using Vikunja, I got rid of planka because it was giving way too much trouble considering the amount of features it doesn’t have.
Yeah they linked the reply I got for asking OP why he thought that and I just went there because of your thread. Seriously lol
Guy called me a nerd just for pointing out Tuxedo even explains on their website how to install snap.
It made a lot of sense after seeing he used to work at Canonical, lol.
I don’t disagree with him in many aspects but I also think he’s a hypocrite in many aspects so…It just led me to stop caring about whatever he does/says
inb4 jwz blocks access to his website from Lemmy
Edit: Jokes aside:
Unlike Google, XScreenSaver will never try to make WebP a thing.
Is WebP bad? If so, why?
I see. Thank you!
Just curious, why do you have Firefox and Librewolf at the same time? Also what is the black icon with the R?
People like to take sides on the internet without doing proper research too, I think. I had this idea that Micay was toxic and kind of avoided the project for a long time. My conclusions after doing more research is that he is someone that lacks social skills and is indeed very opinionated. However, GrapheneOS isn’t made for privacy activists that can afford to use Mull instead of Vanadium, for example. GrapheneOS is made for people that cannot afford to have a phone that might leak information that could endanger their lives.
If Mikay was someone like Palmer Luckey which is a biggot that’s a whole different story. I am glad I gave GrapheneOS a try and I am very happy using it, even if it is kind of overkill for my privacy needs.
Windows (many years) -> Dual boot w/ Ubuntu for a few years -> Windows + WSL (Ubuntu) for many years -> Arch Linux (laptop) + EndeavourOS (desktop) for a few months now
I think I will stick with Arch Linux for new installs, I didn’t have any issue that wasn’t solvable by reading the wiki
The first controller other than the Steam Controller with 4 back buttons that work with steam input I am buying. It seems this isn’t the one yet and I am assuming these custom buttons are in the front (they didn’t show the back at all). 🥲