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; } } }

Enforce a merge strategy per-branch using a merge hook

talg1978

I'm trying to create a merge hook which allows/forbids merge strategy (ff/squash/commit...) on a per-branch basis.

That is, after clicking the 'Merge' button on a PR, only selective types of merge types shall be available from the drop-down menu.

I have already created a skeleton hook from scratch using Atlassian SDK, but I can't figure out how to tweak it to control the merge menu (or any other field in the merge page).

Accepted answers

Ulrich Kuhnhardt _IzymesCo_

Hello there

with your implementation of RepositoryMergeCheck comes

@Override
public RepositoryHookResult preUpdate(@Nonnull PreRepositoryHookContext context,
@Nonnull PullRequestMergeHookRequest mergeHookRequest) {
    // get merge strategy by id
    Optional<String> mergeStrategy = request.getStrategyId();
...
}

There you can check which strategy is selected to the PR and return

RepositoryHookResult.accepted();

RepositoryHookResult.rejected(message, description)

Let me know how you go

Best Ulrich

Izymes // Eliminate boring from work

All comments

Ulrich Kuhnhardt _IzymesCo_

Hello there

with your implementation of RepositoryMergeCheck comes

@Override
public RepositoryHookResult preUpdate(@Nonnull PreRepositoryHookContext context,
@Nonnull PullRequestMergeHookRequest mergeHookRequest) {
    // get merge strategy by id
    Optional<String> mergeStrategy = request.getStrategyId();
...
}

There you can check which strategy is selected to the PR and return

RepositoryHookResult.accepted();

RepositoryHookResult.rejected(message, description)

Let me know how you go

Best Ulrich

Izymes // Eliminate boring from work

talg1978

Hey Ulrich, Thank you so much. I was using a deprecated alternative and now thanks to you I got it right.

talg1978

Hi @Ulrich Kuhnhardt _IzymesCo_ ,

After some time off, I'm back with this issue (Thanks again, your prior answer got me significantly ahead).

The thing is:
The approach you suggested (If I got it right), accepts or rejects the option to proceed from the Pull Request page to the Merge page (by enabling/disabling the 'Merge' button):

I need something slightly different.
I would like to control the possible merge strategies in the drop-down menu once in the merge page.

Is there a way to achieve this?

Ulrich Kuhnhardt _IzymesCo_

Glad you're making some progress. You can configure available repository merge strategies - and only those will be enabled for the merge commit dropdown.

If your hook enforces a certain merge strategy and other strategies are available in the dropdown - the PR will be merged by Bitbucket only if the right strategy is selected. Otherwise the hook will block the merge process.

If you want branch-specific merge strategies you may use a tool like Workzone^ to configure your merge process with more granular control.

Let me know how you go,

Best, Ulrich

^ Disclaimer: Workzone is one of our apps for Bitbucket (Cloud, DC and server)

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

merge

hook