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?

  • The Doctor@beehaw.org
    link
    fedilink
    arrow-up
    1
    ·
    1 year ago

    At work, very rarely so far. I think I’ve run into my first merge conflict in six or seven years last week.

    At home, quite often with Part-DB-symfony, largely because of the composer.lock file.