Docs feedback: Rebasing in (semi-)linear merge methods

Everyone can contribute. Help move this issue forward while earning points, leveling up and collecting rewards.

• Close this issue

I am reading through Rebasing in (semi-)linear merge methods. I ended up with the "Fast-forward merge is not possible. To merge this request, first rebase locally." message. I am trying to figure out how to resolve this.

I followed this answer on SO. Unfortunately that did not resolve my problem.

It would be great if your documentation had a sample of how you are supposed to "rebase locally". A trivial sample, and a little more complicated sample would be really great.