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

Earn badges and make progress

You're on your way to the next level! Join the Kudos program to earn points and save your progress.

Deleted user Avatar
Deleted user

Level 1: Seed

25 / 150 points

Next: Root

Avatar

1 badge earned

Collect

Participate in fun challenges

Challenges come and go, but your rewards stay with you. Do more to earn more!

Challenges
Coins

Gift kudos to your peers

What goes around comes around! Share the love by gifting kudos to your peers.

Recognition
Ribbon

Rise up in the ranks

Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!

Leaderboard

Come for the products,
stay for the community

The Atlassian Community can help you and your team get more value out of Atlassian products and practices.

Atlassian Community about banner
4,559,535
Community Members
 
Community Events
184
Community Groups

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

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