nav[aria-label="Primary Navigation"] { padding: 0; & ul { list-style: none; width: 100%; display: flex; flex-direction: row; justify-content: start; align-items: start; gap: 30px; padding: 0; & li { margin: 0; } & ul li { list-style: none; } } }

Check whether source branch has fallen behind target branch

Sascha SK

Hello,

my company is using Bitbucket Server v6.10.5 with ScriptRunner for Bitbucket v6.6.0.

I would like to create a "Conditional merge check" based on the accepted answer from this post:
https://community.atlassian.com/t5/Answers-Developer-Questions/Validate-PullRequest/qaq-p/536378

My goal is simply to check whether the source branch of an open pull request has maybe already fallen behind the target branch and if so, disable the merge button with a custom veto message.

When I use the code provided in the answer from the link above, I always get the error message: "unable to resolve class com.onresolve.scriptrunner.canned.bitbucket.pullrequests.PullRequestPolicies".

Is anyone able to explain that error and/or how the solution needs to be adjusted so that it works for me?

Thanks a lot in advance
Sascha

Accepted answers

Robert Giddings _Adaptavist_

Hi @Sascha SK ,

ScriptRunner for Bitbucket now comes with a Built-In Merge Check for doing exactly that.

Please view the docs here, for info on the "Prevent Merge of Pull Requests Behind Target Branch" Built-In Merge Check:

https://docs.adaptavist.com/sr4bib/latest/features/script-merge-checks/built-in-merge-checks/prevent-merge-of-pull-requests-behind-target-branch

However you will need to update to at least ScriptRunner for Bitbucket 6.28.0 in order to use it.

Please let me know if this works for you, without needing to write your own custom script?

Kind regards,

Robert Giddings,

Product Manager, ScriptRunner for Bitbucket

All comments

Robert Giddings _Adaptavist_

Hi @Sascha SK ,

ScriptRunner for Bitbucket now comes with a Built-In Merge Check for doing exactly that.

Please view the docs here, for info on the "Prevent Merge of Pull Requests Behind Target Branch" Built-In Merge Check:

https://docs.adaptavist.com/sr4bib/latest/features/script-merge-checks/built-in-merge-checks/prevent-merge-of-pull-requests-behind-target-branch

However you will need to update to at least ScriptRunner for Bitbucket 6.28.0 in order to use it.

Please let me know if this works for you, without needing to write your own custom script?

Kind regards,

Robert Giddings,

Product Manager, ScriptRunner for Bitbucket

Sascha SK

Hi @Robert Giddings _Adaptavist_

thanks a lot for your quick reply.

I will then request the required update to the version you mentioned (or higher) from the responsible team in my company and then let you know a bit later how it went.

Best regards
Sascha

Sascha SK

Hi @Robert Giddings _Adaptavist_ ,

just FYI, the update to the newer version went fine and the new merge check is indeed exactly what we wanted. Thanks again for the hint.

The only unfortunate thing is the predefined veto message which cannot be changed. It always says by default

Please rebase your branch on to the target branch before merging a pull request: git checkout develop; git pull; git checkout feature/<branch-name>; git rebase develop; git push --force-with-lease

although even in the ScriptRunner docs it is mentioned that this is only one of the two solutions besides just merging the target branch into the source branch (so without any rebase). Maybe this can be improved in future versions since it's confusing to developers if rebasing is not the approach that is aimed for.

Best regards
Sascha

Robert Giddings _Adaptavist_

Hi @Sascha SK ,

Thank you for your latest comment.

And custom merge check messages is something we are indeed planning to add to the product in the near future.

Kind regards,

Robert Giddings

Welcome!

It looks like you're new here. Sign in or register to get started.

Quick Links

Find more posts tagged with

server

bitbucket

bitbucket-server