• Croquette@sh.itjust.works
    link
    fedilink
    arrow-up
    0
    ·
    8 months ago

    Thanks for the explanation. It makes sense. To my untrained eyes, it feels like both merge and rebase have their use. I will try to keep that in mind.

    • aubeynarf@lemmynsfw.com
      link
      fedilink
      arrow-up
      1
      ·
      6 months ago

      Never use rebase for any branch that has left your machine (been pushed) and which another entity may have a local copy of (especially if that entity may have committed edits to it).