alphacyberranger@lemmy.world to Programmer Humor@programming.devEnglish · 1 year agoHistory repeats itselflemmy.worldimagemessage-square8fedilinkarrow-up1397arrow-down111
arrow-up1386arrow-down1imageHistory repeats itselflemmy.worldalphacyberranger@lemmy.world to Programmer Humor@programming.devEnglish · 1 year agomessage-square8fedilink
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..).