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?
Honestly, almost never. That’s why there are daily meetings, so that you don’t change the same code at the same time.
This made me realize why I found this whole question so confusing. I write code professionally, but don’t really do open-source professionally or personally. There’s just very little reason for two people to be writing code in the same file in the same week in my job. If it does happen, it still doesn’t usually come close enough to cause a conflict. The rare case I find myself resolving merge conflicts is usually because I have some super old stash that I decide I actually want to apply months later.
Also having issues, pull requests, Projects and so on to organize work.
Are you suggesting you don’t throw 5 developers simultaneously onto a new project with poorly defined and understood requirements and tell them to just get their story done whatever it takes? Because let me tell you, that is a recipe for merge conflicts…