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?

  • mdkcore@fedia.io
    link
    fedilink
    arrow-up
    2
    ·
    1 year ago

    we are experiencing some conflicts now that some new coworkers started in the company, they are getting used to our workflow

    but normally they are quite rare to happen here