Flesh out error handling for merge/rebase.