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

Merge Conflict Warning for Lack of Merge Rights

    XMLWordPrintable

Details

    • Bug
    • Resolution: Fixed
    • Low
    • 2.1.3, 2.2.0
    • 2.0.0
    • Pull Requests
    • None

    Description

      If a user does not have rights to merge to a branch in a repository, Stash suggests there is a "Merge Conflict" in the pull request.

      Steps to reproduce:

      1. Create a new branch and push to server.
      2. Create a pull request with a user that does not have merge permissions on the target branch.
      3. Navigate to the diff view then click the overview tab (must be pushState and not a page pop)

      This message should be more indicative of the lack of permissions for the user as it may lead to developers looking for merge conflicts.

      Attachments

        1. FalseMergeError.png
          FalseMergeError.png
          22 kB
        2. mask.zip
          21 kB
        3. MoreInfo.png
          MoreInfo.png
          27 kB
        4. screenshot1.png
          screenshot1.png
          50 kB

        Issue Links

          Activity

            People

              Unassigned Unassigned
              rluispereiramartins RicardoA
              Votes:
              0 Vote for this issue
              Watchers:
              9 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved: