• JackbyDev@programming.dev
    link
    fedilink
    English
    arrow-up
    3
    ·
    3 months ago

    You’re still rebasing your branch onto main (or whatever you originally branched it off of), but you aren’t then doing a fast forward merge of main to your branch.

    The terminology gets weird. When people say “merge versus rebase” they really mean it in the context of brining changes into main. You (or the remote repository) cannot do this without a merge. People usually mean “merge commit versus rebase with fast forward merge”

    • Croquette@sh.itjust.works
      link
      fedilink
      arrow-up
      1
      ·
      3 months ago

      Yeah I was confused because you are right, merge is usually refered as the git merge and then git commit.

      It makes sense. Thanks for the clarification