this post was submitted on 07 Feb 2025
739 points (99.2% liked)
Programmer Humor
33569 readers
20 users here now
Post funny things about programming here! (Or just rant about your favourite programming language.)
Rules:
- Posts must be relevant to programming, programmers, or computer science.
- No NSFW content.
- Jokes must be in good taste. No hate speech, bigotry, etc.
founded 5 years ago
MODERATORS
you are viewing a single comment's thread
view the rest of the comments
view the rest of the comments
Magit for Emacs is an excellent tool for resolving conflicts.