• thesmokingman@programming.dev
    link
    fedilink
    arrow-up
    9
    ·
    7 months ago

    No you just do a rebase to bring it in. Assuming you’re making atomic commits you shouldn’t have a ton of merge conflicts. If you have to do this a lot, your branch scope is really bad and the problem isn’t in how you’re using got, it’s in how you’re slicing work.

    • Muad'Dibber@lemmygrad.ml
      link
      fedilink
      arrow-up
      4
      ·
      7 months ago

      If you try to pull someone else’s rebased / history rewritten branch, your git will tell you that it’s rejected. You can completely avoid this by merging instead of rewriting history.

      • Atemu@lemmy.ml
        link
        fedilink
        arrow-up
        1
        ·
        7 months ago

        …or you simply rebase the subset of commits of your branch onto the rewritten branch. That’s like 10 simple button presses in magit.