This opinion is wrong and person should feel bad.

Did some more work to fix up his previous, unfinished work, and did git commit --amend (good, we don’t like dozens of commit messages like “oops I forgot this bit”, and squashing at the end is more complicated).

Can’t tell if joke. Doesn’t seem to be. New branch and push amend, drop old branch, solved. The complaints seem to be, “I don’t want to understand git’s rigid workflow, instead I want it to intuit what I want. Just overwrite my shit without asking! It’s more convenient that way!”

Who the hell wants presumption in their source control? I want that behavior as rigid as law.

Remote is truth. Remote is immutable.

Also, are they legitimately complaining that they don’t want small commits? Small commits are best practice because they create granular and traceable history.

This person needs to:

1. Stop expecting a tool to adapt to every user’s presumptive flow, and instead adapt to the tool.
2. Define a commit workflow that resolves granular commits into sensical messages.
3. Don’t use force args on remote unless you’re the admin and know the potential consequences, ya muppet.

All this effort to avoid learning and conforming to the standard workflow. Seriously one of the worst opinions I’ve ever seen. Congrats.

I think the source of this person’s struggle is their own misguided opinions. If they paused and thought, “Why does git do X that way…?”, it would become clear. But who has time for that. Thrash and shout.

TLDR: If git solution is so bad, solve it better.

Disclosure: I love git. I learned it along with vi and the GNU coreutils, etc, at my first job, so the roots run deep. When I think of programming, I think of git.

That said, I can appreciate how it is unintuitive to people who don’t really grok it. It is an incredibly powerful tool, but you have to really learn it on its own terms. You’ll probably have to pick up a little graph theory, memorize a few kata to get yourself out of common problems (merge conflicts, interactive rebases, etc).

I’m not sure how anything could replace it without also feeling lack-luster to people who are already good at git. Maybe we just need to keep adding more tooling and visualisation over top of it and let the power users at least be able to work at those lower levels if they choose to.

I was going to say Git Butler looks like it might have been this, but taking a look at their page now and it seems like they’ve gone all-in on corporate sponsorships. :P

I’d like to look into jujutsu, but I’m very concerned that I might make the hardest part of software development even harder, especially as it won’t be mature right now. Even if I look at it for myself, I could end up distancing myself from the git pain that everyone else has in the team, and thereby make things worse.

That was exactly what it did in my experience. Until they get their own backend rather than operating with a git backend it’s probably going to continue being like that. It was a very intuitive interface otherwise.