336
My coding skill V/S My GitHub Repositories (programming.dev)
submitted 2 years ago by to c/programmer_humor@programming.dev
24 comments fedilink hide all child comments
 
you are viewing a single comment's thread
view the rest of the comments
[–] 1 point 2 years ago (1 child)

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

  • permalink
  • fedilink
  • source
  • parent
  • hideshow 2 child comments
    •
  • [–] 1 point 2 years 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.

  • permalink
  • fedilink
  • source
  • parent