• 0 Posts
  • 10 Comments
Joined 1 year ago
cake
Cake day: October 10th, 2023

help-circle




  • You are doing something wrong and/or your understanding of git/magit is lacking. Pulling from a divergent remote branch is what we all do, every single day and Magit obviously covers this scenario, by default - without rebasing.

    What happens after the magit error? are you in a merge situation? is magit waiting for you to resolve conflicts? if you press m are you asked to to complete or abort the merge?