25
How often do you have to resolve merge conflicts? (feddit.de)
submitted 3 years ago* by to c/programming@beehaw.org
26 comments fedilink hide all child comments
 

Recently I've experienced a significant increase in merge conflicts at the company I'm currently working at (we hired a couple of junior data scientists and some are not that familiar with git)

Even though those merge conflicts can be a little tedious to resolve, I realized that I personally started to enjoy it - especially using fugitive. Haven't had many conflicts in a while, so almost forgot about Gdiffsplit and how awesome that plugin is...

Now I'm wondering, how often do you have to resolve (more or less complex) merge conflicts?

you are viewing a single comment's thread
view the rest of the comments
[–] 2 points 3 years ago

Depended on the size of the team in my experience. With a project of ~50 devs split into 10 teams, I was having to resolve conflicts perhaps every other PR. But training and standards for workflow can certainly help.

  • permalink
  • fedilink
  • source
    •