polish/4147: Change conflict hint if decendants resolves conflict. #4185
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
essiene
force-pushed
the
polish/4147
branch
5 times, most recently
from
6428b9e to
dce3dab
Compare
yuja
reviewed
Jul 31, 2024
essiene
force-pushed
the
polish/4147
branch
2 times, most recently
from
12c5172 to
476b24e
Compare
yuja
approved these changes
Aug 1, 2024
essiene
force-pushed
the
polish/4147
branch
3 times, most recently
from
7201d40 to
a12a187
Compare
yuja
approved these changes
Aug 1, 2024
To avoid always printing the rebase instructions to fix a conflict
even when a child commit to fix the conflict already exists, implement
the following:
* If working commit has conflicts:
* Continue printing the same message we print today.
* If working commit has no conflicts:
* If any parent has conflicts, we print: "Conflict in parent is resolved in working copy".
Also explicitly not printing the "conflicting parent" here, since a merge commit
could have conflict in multiple parents.
* If no parent has any conflicts: exit quietly.
* Update unittests for conflict hinting update.
* Update CHANGELOG
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.
Fixes #4147
Change behaviour to consider the state of the working commit, instead of the state of the tree. In particular:
This behaviour resolves the issue raised in #4147.
Checklist
If applicable:
CHANGELOG.md