Reset conflicted files #10854
Merged
Reset conflicted files #10854
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
ghost
assigned
This was referenced Apr 4, 2023
Special handling must be applied to reseting conflicted files in worktree, as they must be reset to HEAD as index is just a status marker.
gerhardol
force-pushed
the
feature/i10423-reset-conflicted
branch
from
eb982d6
to
76fbdf9
Compare
|
Rebased after #10853, no longer draft |
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.
Depends on #10852 - no behavior dependency but (assumed in code comments, the behavior when resetting will be hard to describe without #10852 too.
Depends on #10853 - no behavior dependency but the same files are changed.First commit is not be reviewed in this PR.Set to draft due to dependency but reviewable.
Fixes #10423 (where both are modified)
Does not handle #10470 that relates to added/removed files
Proposed changes
It was only possible to reset changes to the Index item, the error occurred when resetting the worktree file status item.
The reset must be done to HEAD.
Same behavior in worktree and index, separate implementations.
Test methodology
Manual
Merge strategy
I agree that the maintainer squash merge this PR (if the commit message is clear).
✒️ I contribute this code under The Developer Certificate of Origin.