321
you are viewing a single comment's thread
view the rest of the comments
[-] magic_lobster_party@kbin.social 1 points 10 months ago

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

[-] cyborganism@lemmy.ca 1 points 9 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.

this post was submitted on 14 Jan 2024
321 points (95.7% liked)

Programmer Humor

19503 readers
368 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 1 year ago
MODERATORS