1. Bitbucket
  2. Public Issue Tracker
  3. master

Issues

Issue #8588 closed

Merge conflict instructions are wrong. (BB-9658)

Bitbucket Bot
created an issue

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

Should be

git merge --no-ff -m 'Merged in bacon (pull request #1)' remotes/origin/bacon'

Comments (4)

  1. Log in to comment