beforan@lemm.ee to Programmer Humor@lemmy.mlEnglish · 1 year agoalways try and get my PR merged before anyone elsei.imgur.comimagemessage-square20fedilinkarrow-up1486arrow-down113
arrow-up1473arrow-down1imagealways try and get my PR merged before anyone elsei.imgur.combeforan@lemm.ee to Programmer Humor@lemmy.mlEnglish · 1 year agomessage-square20fedilink
minus-squareThe Cuuuuube@beehaw.orglinkfedilinkEnglisharrow-up8·1 year 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@kbin.sociallinkfedilinkarrow-up3arrow-down1·1 year agoI’m more of a git push origin/main —force guy myself
minus-squaregun/linux@latte.isnot.coffeelinkfedilinkarrow-up3arrow-down1·1 year 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