Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Feature Request] Notify on Merge Conflicts #738

Open
haghabozorgi opened this issue May 26, 2020 · 1 comment
Open

[Feature Request] Notify on Merge Conflicts #738

haghabozorgi opened this issue May 26, 2020 · 1 comment

Comments

@haghabozorgi
Copy link

haghabozorgi commented May 26, 2020

Currently probot-auto-merge does not support merge conflicts. If a merge conflict occurs, it is noted in the PR status and probot's status check shows the PR has merge conflicts, but no notification is received by members of the organization. It would be a great if probot would leave a message on the PR when there is a merge conflict and remove the automerge label. The message on the PR would be added by probot with something like,
"This PR has a merge conflict and the automerge label has been removed. Please resolve conflict and re-add automerge label."

This would allow users to receive a notification about merge conflicts so they could be addressed in a timely fashion, and merge conflicts would be brought to the attention of users quicker. Please let me know if you need any more info from me. Thanks for your efforts on this project.

@rogerluan
Copy link
Contributor

For this, I suggest (now GitHub's) Pull Reminders bot:

image

This specific notification was triggered on Slack. Not sure if it can deliver notifications via GitHub Notifications, but maybe? :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants