• Crow
    link
    fedilink
    arrow-up
    1
    ·
    edit-2
    9 months ago

    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