fix: handle discard conflict with delete#1994
Merged
Merged
Conversation
disrupted
force-pushed
the
discard-conflict
branch
from
July 22, 2026 07:33
f231689 to
4d9ad47
Compare
disrupted
marked this pull request as ready for review
July 22, 2026 07:35
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
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.
When discarding a conflicted file via
xand choosing the side that deleted the file, Neogit now runsgit rm <file>instead ofgit checkout --{ours,theirs} <file>(which fails because there's no file content to check out on the deleted side).