Aral BalkanGit geeks be like “Just did a --squash=<ref> before my interactive rebase with autosquash but I forgot to realign the dilithium crystals so it failed and this is fine so don’t you dare complain about git’s usability you normie!”
Maarten Sneep@aral git is a nightmare to use, and overkill for most projects except the very big ones. I’m sure it is fine for the linux kernel, but few projects reach that scale. I much prefer mercurial. Fewer options to screw up, and (IMHO) friendlier error messages.
@mrtnsnp Oh, don’t get me wrong, I love git. But if I have to do anything out of the ordinary it’s always a deep dive into some esoteric process or other. But my usual workflow is having Sublime Merge up by itself on a separate monitor so I get a realtime view of what I’ve changed. Huge part of the value for me during dev is realtime diffs via that setup.
@aral The problem is not when everything works, but when it doesn’t, exactly what you say. In those cases I’ve found in the past that mercurial is just “nicer”. But yes, work moved to gitlab – because software as a service, can't maintain our own anymore – so now we're on git as well.