Programmer Humor

19480 readers

238 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

Keep content in english
No advertisements
Posts must be related to programming or programmer topics

founded 1 year ago

MODERATORS

[email protected]

485

History repeats itself (lemmy.world)

submitted 1 year ago by alphacyberranger to c/[email protected]

35 comments fedilink hide all child comments

you are viewing a single comment's thread
view the rest of the comments

[–] [email protected] 0 points 1 year ago (1 children)

About 20 developers on one repo in my case, we use a rebase merge strategy with fairly small feature branches so I think that helps keep merge conflicts down. Another thing is our codebase is LARGE, so changes don't often conflict.

[–] [email protected] 0 points 1 year ago

I see... No one cares here and everyone just merges randomly. We have about 20 people working on one repo as well but a lot of times it's the changes to the same file 😭