788
you are viewing a single comment's thread
view the rest of the comments
[-] magic_lobster_party@fedia.io 10 points 1 month ago

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 1 month ago

Also rebase is usually better than merge.

this post was submitted on 11 Oct 2025
788 points (99.1% liked)

Programmer Humor

27778 readers
1678 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