Uploaded image for project: 'Bitbucket Data Center'
  1. Bitbucket Data Center
  2. BSERV-5443

Pull Request resolve conflict instructions are reversed when merging from release branch into feature branch

XMLWordPrintable

      The instructions to resolve a conflicted pull request are wrong, and recommend merging the target branch into the source branch. This is backwards, and would result in an unintentional merge if followed. I have to tell our devs to ignore these instructions.

      A case study:

      I create a pull request from release/1.0 -> feature/develop/1.1 to pick up bugfixes that have been committed to the release branch only. When conflicts arise, I am still seeing instructions like this:

      This pull request has conflicts. You must resolve the conflicts before you can merge:
      Step 1: Fetch the changes (saving the target branch as FETCH_HEAD).

      git fetch origin feature/develop/1.1

      Step 2: Checkout the source branch and merge in the changes from the target branch. Resolve conflicts.

      git checkout release/1.0 
git merge FETCH_HEAD

      Step 3: After the merge conflicts are resolved, stage the changes accordingly, commit the changes and push.

      git commit
git push origin HEAD

      Step 4: Merge the updated pull request.

      These instructions suggest a merge from feature/develop/1.1 -> release/1.0 which is definitely not the behavior I want. I am trying to bring back bugfixes, not bring my 1.1 code into the 1.0 release branch.

      Also see STASH-3083

        1. Screen Shot 2014-10-29 at 10.23.06 AM.png
          Screen Shot 2014-10-29 at 10.23.06 AM.png
          383 kB
        2. Screen Shot 2014-10-29 at 10.27.03 AM.png
          Screen Shot 2014-10-29 at 10.27.03 AM.png
          424 kB

          Form Name

            [BSERV-5443] Pull Request resolve conflict instructions are reversed when merging from release branch into feature branch

            Owen made changes -
            Workflow Original: Stash Workflow - Restricted [ 1447766 ] New: JAC Bug Workflow v3 [ 3136852 ]
            Owen made changes -
            Workflow Original: Stash Workflow [ 756698 ] New: Stash Workflow - Restricted [ 1447766 ]
            Roger Barnes (Inactive) made changes -
            Remote Link Original: This issue links to "Page (Extranet)" [ 88035 ] New: This issue links to "Page (Extranet)" [ 88035 ]
            Adam Brokes made changes -
            Link New: This issue causes STASH-7052 [ STASH-7052 ]
            Roger Barnes (Inactive) made changes -
            Remote Link New: This issue links to "Page (Extranet)" [ 107975 ]
            Roger Barnes (Inactive) made changes -
            Link New: This issue relates to STASHDEV-9263 [ STASHDEV-9263 ]
            Juan Palacios (Inactive) made changes -
            Fix Version/s New: 3.6.0 [ 50494 ]
            Resolution New: Fixed [ 1 ]
            Status Original: Quality Review [ 10029 ] New: Closed [ 6 ]
            Cristan Szmajda (Inactive) made changes -
            Status Original: To be reviewed [ 10026 ] New: Quality Review [ 10029 ]
            Cristan Szmajda (Inactive) made changes -
            Status Original: In Progress [ 3 ] New: To be reviewed [ 10026 ]
            Brent P made changes -
            Link New: This issue is duplicated by STASH-6918 [ STASH-6918 ]

              mheemskerk Michael Heemskerk (Inactive)
              0f04e7726a74 Nick Upton
              Affected customers:
              4 This affects my team
              Watchers:
              9 Start watching this issue

                Created:
                Updated:
                Resolved: