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?
I’d say around 1 time a week. I guess it just tends to happen with a lot of devs working on a single project. But we do have a daily rebase policy for all development branches, so I can’t remember the last time it wasnt some includes mixing badly, or a file being moved. These are all easily fixed.
You are not logged in. However you can subscribe from another Fediverse account, for example Lemmy or Mastodon. To do this, paste the following into the search field of your instance: !programming@beehaw.org
All things programming and coding related. Subcommunity of Technology.
I’d say around 1 time a week. I guess it just tends to happen with a lot of devs working on a single project. But we do have a daily rebase policy for all development branches, so I can’t remember the last time it wasnt some includes mixing badly, or a file being moved. These are all easily fixed.