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

[FEA] auto-merge bot should post instructions for resolving merge conflict when merge fails #3948

Closed
jlowe opened this issue Oct 28, 2021 · 1 comment · Fixed by #3965
Closed
Assignees
Labels
build Related to CI / CD or cleanly building feature request New feature or request

Comments

@jlowe
Copy link
Member

jlowe commented Oct 28, 2021

The auto-merge bot posts a PR to automatically merge, but when the merge fails it simply says, "Manual operation is required." It would be better to have that comment include the steps needed to post a PR that will resolve the merge conflict and also mention that the resulting PR needs to be merge committed rather than squashed. Bonus points if the message is parameterized to include the appropriate branch names (e.g.: a merge PR trying to upmerge branch-21.12 with branch-21.10 that fails with a merge conflict mentions those two branches in the instructions on how to resolve the conflict).

@jlowe jlowe added feature request New feature or request ? - Needs Triage Need team to review and classify build Related to CI / CD or cleanly building labels Oct 28, 2021
@pxLi pxLi self-assigned this Oct 29, 2021
@pxLi
Copy link
Collaborator

pxLi commented Oct 29, 2021

I will add a how-to in the bot comment

@pxLi pxLi removed the ? - Needs Triage Need team to review and classify label Oct 29, 2021
@pxLi pxLi closed this as completed in #3965 Nov 1, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build Related to CI / CD or cleanly building feature request New feature or request
Projects
None yet
Development

Successfully merging a pull request may close this issue.

2 participants