Choose not to auto-merge

Automatically merging based on version numbers is cool. But I don't always want to do that.

Occasionally, there will be a change that should only go into the production branch, but not the development one.

For example, suppose I to adjust the database connection pool to compensate for a bug in production. The bug has been fixed in development, so no workaround commit is needed on the development branch.

What is best way to selectively not auto-merge?

Screenshot from 2014-11-04 01:15:26.png

2 answers

1 accepted

1 vote
Answer accepted

I don't think it's feasible to not auto-merge, as that would cause the changes to be picked up on the next similar pull request.

But I believe it work to "pre-merge" with the "ours" strategy.

git checkout branch-to-exclude
git merge -s ours PROJECT-123

and push.

The merge will still happen, but it won't take any changes from the branch.

Adam Ahmed Atlassian Team Nov 04, 2014

Yup - that's the best way to do it. :) I created a JIRA that you may be interested in following for us to add UI that supports this https://jira.atlassian.com/browse/STASH-5356

@Adam Ahmed , thanks for the confirmation! (I thought I was pretty clever to figure this out....glad to see I'm not alone.)

0 votes
Adam Ahmed Atlassian Team Nov 04, 2014

For Google's benefit, linking to a similar question and answer https://answers.atlassian.com/questions/9390955/answers/9390961/comments/9394426

Suggest an answer

Log in or Sign up to answer
Community showcase
Published Thursday in Bitbucket Pipelines

Building a Bitbucket Pipe as a casual coder

...ipe.sh :  #!/bin/bash source "$(dirname "$0")/common.sh" enable_debug extra_args="" if [[ "${DEBUG}" == "true" ]]; then extra_args="--verbose" fi # mandatory variables R...

233 views 0 12
Read article

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you