always try and get my PR merged before anyone elsei.imgur.comimage beforan ( @beforan@lemm.ee ) Programmer Humor@lemmy.mlEnglish • 2 years ago message-square11fedilinkarrow-up1285
arrow-up1285imagealways try and get my PR merged before anyone elsei.imgur.com beforan ( @beforan@lemm.ee ) Programmer Humor@lemmy.mlEnglish • 2 years ago message-square11fedilink
minus-square The Cuuuuube ( @Cube6392@beehaw.org ) linkfedilinkEnglish9•2 years agogit rebase -x theirs origin/main and then look at the lines your changing to see what needs to be retouched
minus-square magic_lobster_party ( @magic_lobster_party@kbin.social ) linkfedilink4•2 years agoI’m more of a git push origin/main —force guy myself
minus-square gun/linux ( @original_ish_name@latte.isnot.coffee ) linkfedilink3•2 years agoReject “main” branch, embrace master branch
git rebase -x theirs origin/main
and then look at the lines your changing to see what needs to be retouchedI’m more of a
git push origin/main —force
guy myselfReject “main” branch, embrace master branch