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

Automation to notify PR authors that their PR has a merge conflict #15060

Closed
Piedone opened this issue Jan 11, 2024 · 1 comment · Fixed by #15114
Closed

Automation to notify PR authors that their PR has a merge conflict #15060

Piedone opened this issue Jan 11, 2024 · 1 comment · Fixed by #15114

Comments

@Piedone
Copy link
Member

Piedone commented Jan 11, 2024

Is your feature request related to a problem? Please describe.

When a PR has merge conflicts, the reviewer has to point that out if the author doesn't check back. Otherwise, the author wouldn't know that since they opened it, they PR got a merge conflict.

Describe the solution you'd like

Automate this. Similar to what Lombiq's validate-pull-request workflows does (but with pull_request_target), we could use eps1lon/actions-label-merge-conflict to label conflicting PRs, and add a comment under them. See example.

Describe alternatives you've considered

Perhaps there are other usable automation for this but the mentioned action works well.

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