Programming

13226 readers

1 users here now

All things programming and coding related. Subcommunity of Technology.

This community's icon was made by Aaron Schneider, under the CC-BY-NC-SA 4.0 license.

founded 1 year ago

MODERATORS

alyaza@beehaw.org

Hexorg@beehaw.org

remington@beehaw.org

How often do you have to resolve merge conflicts? (feddit.de)

submitted 1 year ago* (last edited 1 year ago) by TiphaineRupa@feddit.de to c/programming@beehaw.org

26 comments fedilink hide all child comments

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?

you are viewing a single comment's thread
view the rest of the comments

[–] l3mming@lemmy.fmhy.ml 2 points 1 year ago* (last edited 1 year ago)

I have to resolve them way more than I should. We have internal devs and external devs and there is a lot of treading on toes. For any conflict that isn't super obvious (90% are) ^*^ I just ask the two devs involved to resolve it together, in a sensible way that keeps the unit tests working.

^*^ Usually the non-obviously conflicts are the ones where it's not just a matter of choosing A or B, but splicing A code with B code.