Details
-
Bug
-
Resolution: Fixed
-
Low
Description
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 (PR#1)' remotes/mbertrand999/blah/bacon
Should be
git merge --no-ff -m 'Merged in bacon (PR#1)' remotes/origin/bacon'