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’ll have to deal with it often if a lot of people you work with aren’t familiar with git and don’t follow best practices. This comes down to the people.doing hands on code work, as well as management who plans out what tasks are supposed to be done simultaneously. (Or higher up less technical people who just want x done now, even if it causes worse issues down the line…) If these parties aren’t educated on both git best practices, as well as the other collaborators’ understanding of them, it’ll be a huge mess. I’ve had to clean up huge messes like that. If your team is highly skilled and competent and actually takes care to get things right, rather than race to the sloppy finish, the issues won’t be nearly as common or disastrous.