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

auto-merge settings issue in Stash Workzone

Bijoy Thomas

Hi Team

The "Attempt immediate auto-merge" is disabled in Workzone global/Admin settings, but still auto merge is happening upon merge criteria's met.

Here is my requirement

I've a Stash User group as Reviewers in Workzone settings and enabled a merge condition that groupQuota >=1. It waits for at least one group member approval to do the merge. Here I want to disable the auto merge upon merge conditions met.

How we can disable auto merge in Workzone?

Thanks/Bijoy

Accepted answers

Ulrich Kuhnhardt [IzymesDev]

Hi Bijoy,

you are right - currently the auto-merge user must have repository/branch write permissions when the auto-merge configuration is saved - and yes - you can revoke those permissions later.

Another work-around is to use branch patterns - auto-merge user permissions are not enforced during configuration when you use a branch pattern in your auto-merge configuration. So instead of choosing 'master' from the dropdown, use 'refs/heads/master' in the branch pattern style configuration. This way you avoid having to revoke the temporary permissions.

Created https://bitbucket.org/izymesdev/workzone/issues/172/auto-merge-configuration-without-auto

All comments

Ulrich Kuhnhardt [IzymesDev]

Hi Bijoy,

I understand that you don't want to trigger an auto-merge upon approval. Do I understand correctly that you want to prevent the PR to be merged if the condition is not satisfied and to be merged manually only when the merge condition is satisfied?

Bijoy Thomas

Hi Ulrich

Thanks for the prompt and quick response.

Yes, that's what we want. Once conditions are met, we need to manually merge changes. We already disabled "Attempt immediate auto-merge", but still it's merging the changes once the condition is satisfied.

Are we missing any property settings? Or do we need to restart the Stash service to take this change?

As a workaround, currently we are adding a dummy auto-merge user with WRITE enabled at project/repo level for configuring the workzone and remove that user rights once workzone settings enabled, so that auto-merge won't happen upon conditions met.

Thanks in advance

Bijoy

Ulrich Kuhnhardt [IzymesDev]

Hi Bijoy,

you are right - currently the auto-merge user must have repository/branch write permissions when the auto-merge configuration is saved - and yes - you can revoke those permissions later.

Created https://bitbucket.org/izymesdev/workzone/issues/172/auto-merge-configuration-without-auto

Bijoy Thomas

Thanks Ulrich for this work-around, this is little more easy compared to add and delete dummy auto merge user.

Ulrich Kuhnhardt [IzymesDev]

Resolved with Workzone version 4.3.2 - leave the auto-merge user field blank.

Bijoy Thomas

Ulrich

I know it's an old post, still checking whether any possibility here.

The empty auto-merge field is working well when we set via UI. We've to set this for a group/bunch of repos via REST call and it's failing with '500 Internal Server Error' when we set auto-merge field empty in JSON object.

Wzautomerge{refName} = "refs/heads/release/1.0"
Wzautomerge{automergeUsers} = []

Am I miss anything here?

Welcome!

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

Quick Links

Find more posts tagged with

bitbucket-server

bitbucket-administration