Programming

13373 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

[–] blind3rdeye@lemm.ee 6 points 1 year ago

Fairly often.

I tend to fork open-source stuff when I want to make my own adjustments, often the adjustments I make are not wanted upstream. So I'm doomed to having merge conflicts for all eternity.

Often what happens though is that I fix some bug, and then a few months later the upstream fixes it in some other way - so the conflict resolution is to basically just throw away my own (clearly superior but now obsolete*) changes, to avoid more conflicts later on.

(* I'm joking. But it does feel bad to throw away good work.)