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?
