477
Every time
(media.wetdry.world)
alt text
wayward vagabond from homestuck: we should improve technology somewhat. well dweller: xkcd 927 "standards"
I actually miss SVN. It had a lot of issues, yes, but the cognitive barrier was so much smaller. When I have a merge error in git, I basically just delete my repo and make a new one...
https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line