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

Stash web merge-help dialogue should indicate that it's performing a manual merge

    XMLWordPrintable

Details

    Description

      Hi,

      We are using GIT Forking workflow for Pull Requests. With the recent upgrade to latest version of 3.7.0, we are seeing some ambiguity in the GIT-Merge-issues-Helper-Dialogue window. Assuming that, the commands provided in the helper dialogue are given wrong way, the sourcerepo,sourcebranch and targetrepo and targetbranch values are reading as opposite way.

      Please refer my two attached images, where the sourceref and targetref repos and branches showed in first image and helper dialogue image is attached as second image. The commands suggested in this window are trying to merge sourcebranch to targetbranch and push the merged code (destination branch) directly to destination repo directly. We have enabled another plugin 'PullRequest must Please' plugin to allow everyone to use PR for code pushes.

      Let me know if something wrong here or the suggested workaround to fix it on my stash instance.

      Appreciate for your quick hep on this.

      Regards,
      Srinivas

      Attachments

        1. image1.PNG
          image1.PNG
          12 kB
        2. image2.PNG
          image2.PNG
          29 kB

        Issue Links

          Activity

            People

              khughes@atlassian.com Kristy
              79063806424a RM BuildUser
              Votes:
              0 Vote for this issue
              Watchers:
              2 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved: