Do not rollback branch state in case of a merge failure#21

Kobzol merged 1 commit intomainrust-lang/josh-sync:mainfrom

merge-conflictrust-lang/josh-sync:merge-conflictCopy head branch name to clipboard