Extra error handling for when there are conflicts in the rebase.
Add some extra notes about the scripts.