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?
I have to resolve them way more than I should. We have internal devs and external devs and there is a lot of treading on toes.
For any conflict that isn’t super obvious (90% are) * I just ask the two devs involved to resolve it together, in a sensible way that keeps the unit tests working.
* Usually the non-obviously conflicts are the ones where it’s not just a matter of choosing A or B, but splicing A code with B code.
You are not logged in. However you can subscribe from another Fediverse account, for example Lemmy or Mastodon. To do this, paste the following into the search field of your instance: !programming@beehaw.org
All things programming and coding related. Subcommunity of Technology.
I have to resolve them way more than I should. We have internal devs and external devs and there is a lot of treading on toes. For any conflict that isn’t super obvious (90% are) * I just ask the two devs involved to resolve it together, in a sensible way that keeps the unit tests working.
* Usually the non-obviously conflicts are the ones where it’s not just a matter of choosing A or B, but splicing A code with B code.