troll-gpt

joined 1 year ago
[–] troll-gpt@alien.top 1 points 1 year ago

What does it mean?

[–] troll-gpt@alien.top 1 points 1 year ago

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?

[–] troll-gpt@alien.top 1 points 1 year ago (1 children)

This. Git pull will never rebase unless told to do so.