If you haven’t already, take a look at my first git rebase / Pikmin blog post [https://jacobsalmela.com/2019/09/22/git-rebase-is-the-pikmin-of-source-control/] about how to learn and use git rebase.  That post covers the basics, while this one will conceptualize how to use git rebase when things go bad:

git isn’t easy to learn, and once you do, the git rebase command seems to invoke fear and confusion in many people.  But once you learn how to use it effectively, you’ll wish you had learned it sooner–both for your solo projects and while working on a