Changes

*** if there is a merge conflict, the rebase pauses so you can fix things

*** use <code>git rebase --continue</code> or <code>git rebase --abort</code> to move forward after such a pause

** Never rebase commits that are shared publicly in another repo. Only do it on commits you own locally (e.g., a topic branch you are working on)

** Don't use rebase to get rid of commits in a public branch, use <code>git revert commit-sha</code> instead to apply an inverse commit