email notifications for cascade merge conflict?

[Alexander Bird]

Are there supposed to be email notifications for merge conflicts caused by cascade merges? In my situation, the PR (pull requests) are correctly being created, but I think that the person under whom the PR is created is not getting emailed that the PR is created.

Does Stash email users when a cascade merge has a conflict? If so, what does the email look like? Maybe I was searching email history with wrong keywords and that's why I didn't find it.

[dkordonski · Accepted solution]

Actually Stash does email users when an automatic cascading merge fails. See below for how it should look like (the notification will be sent against the original pull request that triggered the automatic merge)

automergefail.jpg

[Alexander Bird]

hmmm. What version of Stash required? We have 3.1.5. Also, just to clarify, In your screenshot example, I am assuming you are the one who merged a PR into release/3.7 (or prior release). Is that correct?

[Alexander Bird]

ok -- So it turns out that I was searching for wrong keywords. People _are_ getting emails for those failed cascade merges.

[dkordonski]

This was implemented right in the first release that shipped automatic merge, which was one of Stash 2.x. Glad to hear you the emails work for you! We are also working to update the online documentation to mention the email notification for automatic merge failure

[dkordonski]

And to answer your another question, yes, the email should be send out to the person who merged the original PR, who will also be set as the author of the new "conflicted" PR

[Nikolay Rumyantsev]

Am I able to customize the body and/or recipients of the conflict email notification? I want to notify the whole team in case a conflict arises to ensure everybody's aware. Also let's assume Mr. A merged a PR that causes a auto merge conflict. He's got notified. After that Mr. B merged another PR to the same branch. Can we determine if his PR causes a conflict too? If so will he receive a notification? The goal is to help Mr. A and Mr. B to collaborate on conflicts resolving and to keep other in the know on the cascade state. 

[Debayan Majumdar]

I am trying to implement the same and I am not finding a way to set up the notifications. Our merge happens through a service account user. The PR that gets generated if cascading merge fails gets opened under the service account and no one gets notified.

It also does not seem to obey the default reviewers rules. I have rules set up to add default reviewers for certain branches, but when PR is opened under the service account user after auto-merge failure, the default reviewers do not get added.

Would appreciate any help.

[ThiagoBomfim]

Hi Alexander,

Stash does not send emails in case of a merge conflict. You can find a list of emails notifications send by Stash Pull Requests on this link.

We know that plugins like Workzone do that - specifically, see their documentation under "Notification". Are you using this plugin or even a custom plugin to perform that task?

I hope that helps.

Best,
Thiago

[Adam]

Note that while Thiago is correct that for normal merge conflicts we don't send emails, automatic/cascading merges are an exception.