@[email protected] to Programmer [email protected]English • 1 year agoalways try and get my PR merged before anyone elsei.imgur.comimagemessage-square18fedilinkarrow-up1501arrow-down112
arrow-up1489arrow-down1imagealways try and get my PR merged before anyone elsei.imgur.com@[email protected] to Programmer [email protected]English • 1 year agomessage-square18fedilink
minus-squareThe CuuuuubelinkfedilinkEnglish0•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_partylinkfedilink-1•1 year agoI’m more of a git push origin/main —force guy myself
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