• Muad'Dibber@lemmygrad.ml
    4·
    11 个月前

    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
      1·
      11 个月前

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