monitorjbl / pr-harmony

Extra pull request workflows for Stash
GNU General Public License v3.0
33 stars 17 forks source link

Block Automatic Merges #35

Open jgassner opened 8 years ago

jgassner commented 8 years ago

My group would find it very helpful if there was an option to Block Automatic Merges, similar to the option to "Block Direct Commits". Automatic Merges are awesome, but when we want to temporarily code freeze a branch (e.g., just before release), we'd like to prevent Automatic Merges from going into that branch during the code freeze but are perfectly happy with (and want) Automatic Merges to happen as normal to branches with an earlier version than the one we've placed a code freeze on. When an Automatic Merge is blocked to a branch, having the system create an "Automatic Merge Failure" pull request just like it already does when there is a code conflict or permissions issue would be perfect.

Here's an example scenario: release/1.0 release/1.1 release/2.0 (code freeze) master

If a pull request is merged into release/1.0, I would like it to be automatically merged to release/1.1, but an Automatic Merge Failure pull request created for the merge from release/1.1 to release/2.0. Later, when the code freeze for release/2.0 is removed, Automatic Merge Failure pull request will be manually merged to release/2.0 and then automatic merging should take over and merge it to master.

monitorjbl commented 8 years ago

I'm a little confused. The start of the issue makes it sound like you want to be able to block automerging on certain branches. But your example sounds like you want the plugin to make a duplicate PR on a different branch but only if the PR you originally opened is opened on certain branches.

These sound like two wildly different use cases, so I'll assume I'm just not understanding the issue fully. Can you elaborate a bit more? For the first part, I would think that you could just remove the branch from the auotmerge config.

jgassner commented 8 years ago

Thanks for thinking about this one! I think I figured out where the confusion is. When I say automatic merge I'm referring to this feature: https://confluence.atlassian.com/bitbucketserver/automatic-branch-merging-776639993.html Sorry for not being clearer, I forgot that this plugin also has an automerge feature.

monitorjbl commented 8 years ago

I'll have to take a closer look at this feature. I haven't used it in the past, so I'm not sure how best to integrate with it.