JPDev@programming.dev to Programmer Humor@programming.dev · 1 year agoRebase Supremacyprogramming.devimagemessage-square238fedilinkarrow-up11.14Karrow-down123
arrow-up11.11Karrow-down1imageRebase Supremacyprogramming.devJPDev@programming.dev to Programmer Humor@programming.dev · 1 year agomessage-square238fedilink
minus-squareCrow@lemmy.blahaj.zonelinkfedilinkarrow-up1·edit-21 year agoSo, with a merge you basically shuffle in the changes from both branches, but a rebase takes only the changes from one branch and puts it over the other? Edit: no. Read wrong. I should probably watch a vid about it or something
minus-squareBlackPenguins@lemmy.worldlinkfedilinkarrow-up2·1 year agoIt inserts the master changes before the task branch ones.
So, with a merge you basically shuffle in the changes from both branches, but a rebase takes only the changes from one branch and puts it over the other? Edit: no. Read wrong. I should probably watch a vid about it or something
It inserts the master changes before the task branch ones.