beforan@lemm.ee to Programmer Humor@lemmy.mlEnglish · 2 years agoalways try and get my PR merged before anyone elsei.imgur.comexternal-linkmessage-square6fedilinkarrow-up140arrow-down11
arrow-up139arrow-down1external-linkalways try and get my PR merged before anyone elsei.imgur.combeforan@lemm.ee to Programmer Humor@lemmy.mlEnglish · 2 years agomessage-square6fedilink
minus-squareKorne127@lemmy.worldlinkfedilinkEnglisharrow-up0·2 years agoMerge conflict in general is fine What’s really bad is if someone drastically changed the implementation of something which you’ve also changed and if you completely need to rework it…
minus-squareRedditWanderer@lemmy.worldlinkfedilinkEnglisharrow-up1·2 years ago What’s really bad is if someone drastically changed the implementation of something which you’ve also changed That’s not a merge conflict, that’s a management conflict.
Merge conflict in general is fine
What’s really bad is if someone drastically changed the implementation of something which you’ve also changed and if you completely need to rework it…
That’s not a merge conflict, that’s a management conflict.