alphacyberranger@lemmy.world to Programmer Humor@programming.devEnglish · 2 years agoHistory repeats itselflemmy.worldimagemessage-square20fedilinkarrow-up1478
arrow-up1478imageHistory repeats itselflemmy.worldalphacyberranger@lemmy.world to Programmer Humor@programming.devEnglish · 2 years agomessage-square20fedilink
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..).