Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

Next challenges

Recent achievements

  • Global
  • Personal


  • Give kudos
  • Received
  • Given


  • Global

Trophy case

Kudos (beta program)

Kudos logo

You've been invited into the Kudos (beta program) private group. Chat with others in the program, or give feedback to Atlassian.

View group

It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

Is there a way to override the auto-merge on a per-case basis?

This question is in reference to Atlassian Documentation: Automatic branch merging

The automatic branch merging is awesome, but there’s one scenario that makes me wish there was a way to override it on specific commits. Here’s the scenario:

You have some branches like:

  • release/1.0
  • release/2.0
  • release/2.1

You find a bug near the end of 2.0 and you don’t have enough time for a "real" fix so you do a duct-tape fix and file/clone a bug to track a real fix for 2.1. With the auto-merging, the duct-tape fix goes in 2.0 and 2.1, but that adds another layer of problems in that you also have to track extricating the duct-tape fix out of the 2.1 release.

An edge case scenario, but I was hoping this was on the radar or there might be a plug-in to handle something like this?

1 answer

I have resorted to having an admin disable automatic merging while I perform the merge then reenable it. Being able to everride the auto-merge at merge time would be an awesome feature.


Suggest an answer

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

Powering DevOps with Bitbucket Server & Data Center

Hi everyone, The Cloud team recently announced 12 new DevOps features that help developers ship better code, faster   ! While we’re all excited about the new improvements to Bitbucket ...

2,386 views 1 8
Read article

Community Events

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

Find an event

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

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you