back
2 comments
> "but what if i mess it up?"

Remember to make a backup branch. I use "t" or "tt" or "ttt" as name of the branch. It's like "temp" or "temporal", but I'm too lazy.

git rebase -i -r for advanced mode: git will keep merge commits, allowing you to make surgical changes to any side of a merge.