alphacyberranger@lemmy.world to Programmer Humor@programming.devEnglish · 1 year agoHistory repeats itselflemmy.worldexternal-linkmessage-square35fedilinkarrow-up1478arrow-down111
arrow-up1467arrow-down1external-linkHistory repeats itselflemmy.worldalphacyberranger@lemmy.world to Programmer Humor@programming.devEnglish · 1 year agomessage-square35fedilink
minus-squarepomodoro_longbreak@sh.itjust.workslinkfedilinkarrow-up1·1 year 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..).