Question on "Merge only after pull request" restriction

[Glyn Jones]

I have set up a baseline branch to restrict all users from pushing to it, as I only want code merged after a pull request has been approved.

This works fine if the Stash GUI is used to do the merge.

However, there are times when the pull request has been approved after the head of the baseline branch has moved on significantly.

I'd like to be able to do the approved merge to my local baseline branch, verify the build locally (possibly fixing errors caused during the merge), then push the baseline branch back to the repository. This is particularly important when the changes overlap and the merges are non-trivial.

When I try this, the git push is rejected, as no-one is allowed to push to the baseline branch, even though the merge was of an approved pull request.

Is there a  way to allow this behaviour? I've read the documentation but couldn't find anything in there.

[Gonchik Tsymzhitov]

Hello Glyn, 

As I understand do you want decline the push to base line branch. 

If I were you I will set the branch permission on repo,  

then develop own pre-receive hook:

references:

• https://confluence.atlassian.com/bitbucketserver/using-repository-hooks-776639836.html
• https://www.atlassian.com/git/tutorials/git-hooks
• https://confluence.atlassian.com/bitbucketserverkb/how-to-create-a-simple-hook-in-bitbucket-server-779171711.html
• you can read other hooks from open source https://github.com/sford/yet-another-commit-checker
• Or on groovy https://scriptrunner.adaptavist.com/5.0.7/bitbucket/PreReceiveHooks.html

Or another point is the use some hook from marketplace.

• like this https://marketplace.atlassian.com/plugins/com.isroot.stash.plugin.yacc/server/overview

Hope it helps 

Cheers,

Gonchik Tsymzhitov