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

Cascading merge failure pull request description is not correct when branch permissions prevented merging

XMLWordPrintable

      Issue Summary

      When a cascading merge fails with no conflicts but due to no write permission to the target branch the pull request description states "There was a merge conflict cascading the merge to this branch".

      This is reproducible on Data Center: yes

      Steps to Reproduce

      1. Setup cascading release branches.
      2. Merge a pull request to an earlier branch as a user that does not have permission to one of the later branches (ensuring there are no merge conflicts).

      Expected Results

      Pull request description for cascading merge failure pull request states the reason of the failure was due to branch permissions.

      Actual Results

      The pull request description states "There was a merge conflict cascading the merge to this branch", even when there are no merge conflicts.

      Workaround

      The reason for the cascading merge failure can be determined from looking at the merge checks next to the merge button. For example if branch permissions are configured in a way that prevents merging, a merge check warning will display with:

      "You have insufficient permissions to update '<branch name>'. Check your branch permissions with the project administrator."
      

              854eef6f5746 Kusal Kithul-Godage
              spetrucev Stefan
              Votes:
              0 Vote for this issue
              Watchers:
              1 Start watching this issue

                Created:
                Updated:
                Resolved: