this post was submitted on 11 Oct 2025
697 points (99.2% liked)

Programmer Humor

26827 readers
1765 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
697
When you screw up git (infosec.pub)
submitted 1 day ago by cm0002@lemdro.id to c/programmer_humor@programming.dev
62 comments fedilink hide all child comments
you are viewing a single comment's thread
view the rest of the comments
[–] magic_lobster_party@fedia.io 8 points 1 day ago (1 children)

Keep your commits small. Merge often. That will reduce the likelihood of terrible merge conflicts.

If you’re not sharing your work with your team mates for a long time, then you’re setting yourself up for trouble.

[–] SpaceCowboy@lemmy.ca 3 points 1 day ago

Also rebase is usually better than merge.