You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
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).
The text was updated successfully, but these errors were encountered:
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).
The text was updated successfully, but these errors were encountered: