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?

  • Kissaki@feddit.deEnglish
    2·
    1 年前

    In my team of four developers, very rarely.

    I may even be resolving more conflicts against my own changes in other branches than against others changes.> Gdiffsplit

    When they occur, TortoiseGitMerge usually resolves them automatically.