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.
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.
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?
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.
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.
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.
Rustaceans 🤝 Vegans
Well, I just realized they don’t support multi user which is kind of a deal breaker for us, since we are a couple sharing a homelab. We always wanted to share a few files when using Logseq and it seems this won’t be solved with Trilium either. This sucks.
We liked Readeck way better than Omnivore. Their browser extension is also very good.
I used to follow Ladybird/SerenityOS stuff but their takes on “political stuff” is just… too bad.
https://github.com/SerenityOS/serenity/pull/6814