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…
No I’m wondering, how often do you have to resolve (more or less complex) merge conflicts?
With ~10 people on the team, many products, and dozens of repositories that we maintain, rarely. Maybe a few times per month. In the two years I’ve been with this company, I haven’t run into a single merge conflict that wasn’t straightforward to sort out.