beforan ( beforan@lemm.ee ) to Programmer Humor@lemmy.mlEnglish · 3 years agoalways try and get my PR merged before anyone elsei.imgur.comexternal-linkmessage-square11linkfedilinkarrow-up1284
arrow-up1284external-linkalways try and get my PR merged before anyone elsei.imgur.combeforan ( beforan@lemm.ee ) to Programmer Humor@lemmy.mlEnglish · 3 years agomessage-square11linkfedilink
minus-squareThe Cuuuuube ( Cube6392@beehaw.org ) linkfedilinkEnglisharrow-up9·3 years agogit rebase -x theirs origin/main and then look at the lines your changing to see what needs to be retouched
minus-squaremagic_lobster_party ( magic_lobster_party@kbin.social ) linkfedilinkarrow-up4·3 years agoI’m more of a git push origin/main —force guy myself
minus-squaregun/linux ( original_ish_name@latte.isnot.coffee ) linkfedilinkarrow-up3·3 years agoReject “main” branch, embrace master branch
git rebase -x theirs origin/mainand then look at the lines your changing to see what needs to be retouchedI’m more of a
git push origin/main —forceguy myselfReject “main” branch, embrace master branch