Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

Is there a way to detect auto merge conflicts in a Pull Request Enforcement Policy?

jimmurphy@salesforce.com
I'm New Here
I'm New Here
Those new to the Atlassian Community have posted less than three times. Give them a warm welcome!
February 15, 2018

Hi,

In Bitbucket Scriptrunner, I have a Pull Request enforcement policy setup that scans PRs and the associated commits for the existence of bug ids (not for Jira).  The policy works fine until it runs into a merge conflict from the auto merge process.  Is there a way to detect that the auto merge has found the conflict and to then let it pass through the script so that the resulting Pull Request can be created?  When the conflict occurs, the script fails, displaying the error message from event.cancel. 

Thanks,

Jim Murphy

0 answers

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events