Specify which files had merge conflicts while cherry-picking #1934
Conversation
This file contains 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
iancha1992
force-pushed
the
show_conflicted_files
branch
from
6bea5fa
to
a5cc317
Compare
iancha1992
requested review from
fweikert,
meteorcloudy and
Wyverald
as code owners
|
cc: @keertk |
Wyverald
reviewed
Mar 29, 2024
Wyverald
reviewed
Mar 29, 2024
iancha1992
force-pushed
the
show_conflicted_files
branch
2 times, most recently
from
f5b7c25
to
be1e602
Compare
iancha1992
force-pushed
the
show_conflicted_files
branch
from
be1e602
to
72a5635
Compare
|
Made fixes as per @Wyverald suggestions and tested (examples here: iancha1992/bazel#525 (comment)) |
Wyverald
reviewed
Mar 29, 2024
Wyverald
approved these changes
Mar 29, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
When cherry-picking, the bot issues a comment "Cherry-pick was attempted but there were merge conflicts in the following file(s). Please resolve manually." But there can be an improvement for the users and specify which files had the conflicts.