fix: preserve unrelated unstaged changes on conflict - #1483
Open
Sakshamm-Goyal wants to merge 2 commits into
Open
fix: preserve unrelated unstaged changes on conflict#1483Sakshamm-Goyal wants to merge 2 commits into
Sakshamm-Goyal wants to merge 2 commits into
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
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.
Closes #1480
Context
When the hidden patch for a partially staged file conflicts with hook output, Lefthook resets the whole tracked worktree before replaying only the partial-file patch. That restores the conflicting file, but silently discards pre-existing unstaged changes in unrelated tracked files.
Changes
Validation
AI usage
Prepared with Codex; the behavior is covered by the fail-first integration regression and repository test commands listed above.
Confidence Score: 5/5
The PR appears safe to merge.
No blocking failure remains.
Reviews (2): Last reviewed commit: "fix: preserve recovery error context" | Re-trigger Greptile
Context used: