Merge Conflict Warning for Lack of Merge Rights

XMLWordPrintable

    • Type: Bug
    • Resolution: Fixed
    • Priority: Low
    • 2.1.3, 2.2.0
    • Affects Version/s: 2.0.0
    • Component/s: Pull Requests
    • None

      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.

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

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

              Created:
              Updated:
              Resolved: