Provide assistance in the event of a merge conflict #17
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
per1234
added
type: enhancement
Contributor
|
Hi @per1234. If you intended to submit a library, please check the instructions and update your pull request if necessary: |
github-actions
bot
added
other
and removed
topic: code
umbynos
approved these changes
Apr 27, 2021
silvanocerza
approved these changes
Apr 27, 2021
It's certain that merge conflicts will occur as submitters take time to resolve blocking issues and other submissions are accepted in the meantime. The PR merge will fail in this case. Previously there was no provision for handling merge conflicts. The workflow run just failed at the merge job with no comment from the bot. The goal is for the automated system to work with the submitter as much as possible. Towards this goal, when the merge fails, the bot will now comment to explain the problem and provide a link to a general tutorial for using the GitHub PR merge conflict system. A review is requested from the Tooling Team so that they can assist in the event the user is unable to resolve the merge conflict, or the failure was caused by something else.
per1234
force-pushed
the
assist-merge-conflict
branch
from
c64d292 to
9710f18
Compare
Contributor
|
Hi @per1234. If you intended to submit a library, please check the instructions and update your pull request if necessary: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
It's certain that merge conflicts will occur as submitters take time to resolve blocking issues and other submissions are
accepted in the meantime. The PR merge will fail in this case.
Previously there was no provision for handling merge conflicts. The workflow run just failed at the merge job with no
comment from the bot.
The goal is for the automated system to work with the submitter as much as possible. Towards this goal, when the merge
fails, the bot will now comment to explain the problem and provide a link to a general tutorial for using the GitHub PR
merge conflict system.
A review is requested from the Tooling Team so that they can assist in the event the user is unable to resolve the merge
conflict, or the failure was caused by something else.