this post was submitted on 14 Jan 2024
336 points (95.9% liked)
Programmer Humor
19512 readers
603 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
you are viewing a single comment's thread
view the rest of the comments
view the rest of the comments
Cloning a repo to build the source code isn't even remotely hard.
When you manage the repo of an entire team who work together on different release versions of a product using a very specific workflow with squash commits and cherry-picking? And when team members fuck up the repo's history with a bad git pull/push? Yeah, it gets more complicated.
If a team member can fuck up the history you probably should look into your merge policies.
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.