Merge conflict instructions are wrong. (BB-9658)
The instructions for resolving a merge conflict currently have an incorrect path to the remote. Instead of 'origin' the 'user/repo' is shown. For example:
git merge --no-ff -m 'Merged in bacon (pull request #1)' remotes/mbertrand999/blah/bacon
git merge --no-ff -m 'Merged in bacon (pull request #1)' remotes/origin/bacon'