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-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.
That’s not a merge conflict, that’s a management conflict.