Programmer Humor

19551 readers

972 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]

336

My coding skill V/S My GitHub Repositories (programming.dev)

submitted 10 months ago by [email protected] to c/[email protected]

25 comments fedilink hide all child comments

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

[–] [email protected] 1 points 10 months ago (1 children)

If a team member can fuck up the history you probably should look into your merge policies.

[–] [email protected] 1 points 10 months ago

Even with merge policies, if someone doesn't understand what they're doing or how it works, it won't help.

Last project I worked on, we asked our developers to rebase on the parent branch and squash on their pull requests. But, they often encountered conflicts because they never updated their branch. They would pull the parent branch into their feature breach, or do a regular merge, or merge different other branches together and you'd end up with commit duplication everywhere. They didn't have any discipline.