If you haven’t already, take a look at my first git rebase / Pikmin blog post 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: conflicts, force pushing, and working with a