chore(ci): update an issue when conflict prevent auto merge #15551
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
daschuer
reviewed
Oct 30, 2025
acolombier
force-pushed
the
chore/notify-when-conflict-arise
branch
from
6241d0d to
1e64148
Compare
daschuer
reviewed
Nov 1, 2025
Member
daschuer
left a comment
daschuer
left a comment
There was a problem hiding this comment.
LGTM, thank you for this nice helper.
daschuer
approved these changes
Nov 8, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
Automatically update an issue if branch sync cannot work due to conflict.
I have made the choice to reopen the related issue instead of continuously creating new one, to try and keep the issue sequence under control, but it could be pretty easy to have a 1:1 mapping otherwise.
Note that it should also auto close existing issue when the issue gets resolved.