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

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.

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

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

Suggest an answer

Log in or Sign up to answer
Atlassian Community Anniversary

Happy Anniversary, Atlassian Community!

This community is celebrating its one-year anniversary and Atlassian co-founder Mike Cannon-Brookes has all the feels.

Read more
Community showcase
Published Dec 27, 2017 in Bitbucket

Recipe: Deploying AWS Lambda functions with Bitbucket Pipelines

Bitbucket Pipelines helps me manage and automate a number of serverless deployments to AWS Lambda and this is how I do it. I'm building Node.js Lambda functions using node-lambda&nbsp...

2,048 views 1 5
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