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?
I’m curious about the apps now lol
Not that the semantics matter in this case, NOT operator exists for a reason
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.
It seems many banks/providers used to had this functionality and just stopped maintaining in favor of Google/Apple Pay.
Hopefully they decide to do it again.
Yes I realized that, the one that doesn’t is Aurora I think
I’m confused why you would assume that there isn’t any context where someone might need to store their cards on their phone instead of carrying a wallet. Have you considering asking why instead of assuming everyone is like you? Is amazing when you get to know other perspectives.
The good old if false return true
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.
If this means that I might be able to use NFC payments because alternatives to Google Pay will exist, I am very happy. Hopefully this will also make possible to F-droid to provide auto updates.
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 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?
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
I giggled, thank you.
Just make sure things are working while doing this. Maybe accepting your changes and the incoming changes is the correct way, but you need to know what you are doing.