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

Choose not to auto-merge

Lucid Software

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

Accepted answers

Lucid Software

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.

All comments

Lucid Software

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

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

Adam

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

Lucid Software

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

Welcome!

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

Quick Links

Find more posts tagged with

bitbucket-server

merge