• @[email protected]
    link
    fedilink
    1
    edit-2
    6 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

    • @BlackPenguins
      link
      26 months ago

      It inserts the master changes before the task branch ones.