alphacyberranger@lemmy.world to Programmer Humor@programming.devEnglish · 2 years agoHistory repeats itselflemmy.worldimagemessage-square27fedilinkarrow-up1412arrow-down112
arrow-up1400arrow-down1imageHistory repeats itselflemmy.worldalphacyberranger@lemmy.world to Programmer Humor@programming.devEnglish · 2 years agomessage-square27fedilink
minus-squarepomodoro_longbreak@sh.itjust.workslinkfedilinkarrow-up1·2 years agoIf the changes are small enough I just do rebase -Xtheirs main, and look to see if anything looks fucky (git diff main..).
If the changes are small enough I just do
rebase -Xtheirs main, and look to see if anything looks fucky (git diff main..).