this post was submitted on 11 Oct 2025
559 points (98.9% liked)

Programmer Humor

26827 readers
2369 users here now

Welcome to Programmer Humor!

This is a place where you can post jokes, memes, humor, etc. related to programming!

For sharing awful code theres also Programming Horror.

Rules

founded 2 years ago
MODERATORS
Feyter@programming.dev
anzo@programming.dev
BurningTurtle@programming.dev
pylapp@programming.dev
559
When you screw up git (infosec.pub)
submitted 14 hours ago by cm0002@lemdro.id to c/programmer_humor@programming.dev
59 comments fedilink hide all child comments
you are viewing a single comment's thread
view the rest of the comments
[–] Anafabula@discuss.tchncs.de 6 points 11 hours ago

Jujutsu (which is compatible with git) has a nice conflict resolution flow that doesn't break you workflow.

Conflicts are encoded into the commits, so that there is never a weird in between state that you have to deal with immediately before being able to do anything else.
Then you can use Jujutsu's easier history manipulation to resolve the conflict in the conflicted commits.

https://steveklabnik.github.io/jujutsu-tutorial/branching-merging-and-conflicts/conflicts.html

And you could always jj undo if you did something you didn't want to.