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?
My current team is only 5 devs, and we generally keep decent track of who’s working on what so that helps to avoid stepping on each other’s toes too badly. Once a codebase gets to a stable point it gets easier to tackle stuff in smaller changesets that don’t span a high number of files.
Tests can be a bit more of an issue though, especially if we’re doing things like counting mock interactions. It might not be a true conflict, or even a breaking issue, but it does require an extra check or two to get that right.