How often do you have to resolve merge conflicts?
How often do you have to resolve merge conflicts?
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're viewing a single thread.
Occasionally I'll get hit with a few unwieldy conflicts. Usually it's one or two lines, and always a whitespace issue because someone's code style just has to be different.