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

This widget could not be displayed.

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
Atlassian Summit 2018

Meet the community IRL

Atlassian Summit is an excellent opportunity for in-person support, training, and networking.

Learn more
Community showcase
Published yesterday in Marketplace Apps

The 7 hacks of highly successful automation

...there's anything I've learnt from working, it's that people are lazy! No offense to anyone reading this, but it's true and we can all admit it. The easier you make something for someone, the more...

120 views 0 9
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