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

Programmer Humor

32786 readers
513 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 3 years ago
MODERATORS
you are viewing a single comment's thread
view the rest of the comments
[–] magic_lobster_party@fedia.io 10 points 10 months 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 4 points 10 months ago

Also rebase is usually better than merge.