Uploaded image for project: 'Bitbucket Cloud'
  1. Bitbucket Cloud
  2. BCLOUD-8588

Merge conflict instructions are wrong. (BB-9658)

    XMLWordPrintable

Details

    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'

      Attachments

        Activity

          People

            Unassigned Unassigned
            legacy-bitbucket-user Legacy Bitbucket Cloud User (Inactive)
            Votes:
            0 Vote for this issue
            Watchers:
            1 Start watching this issue

            Dates

              Created:
              Updated:
              Resolved: