If you’ve ever submitted a pull request to an open source there is a good chance you’ve heard these two awful words:
At this point you either throw your hands up and say oh well or start researching how to actually do a rebase.
The official documentation is rather confusing because it attempts to outline every type of rebase Git supports.
Rob Allen decided to simplify this and wrote up a beginners guide to doing a rebase.
Rob was able to simplify it down to just 6 steps and makes Git rebasing much more approachable.