Don't show Unmerged files in Staged area #1359
Merged
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
Unmerged files (i.e unresolved conflicts) should only appear in the Unstaged area, and not "duplicated" in the Staged area. Motivation: * The user-friendly git-status command does not show these as "Changes to be committed". * If they appear in the Staged area, they are quite redundant since the Diff view will just show "No changes or only EOL changes". * Some other Git UIs (like Fork) don't show these as Staged items either. NOTE: According to docs for the git-status "Short Format" (and --porcelain=v1), the XY fields for Unmerged paths do NOT actually represent the Index & Working-tree states, instead they represent the states introduced by each HEAD in the merge (i.e Ours & Theirs, relative to Base).
love-linger
added a commit
that referenced
this pull request
May 24, 2025
…the `unmerged` file state (#1359) Signed-off-by: leo <longshuang@msn.cn>
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.
Unmerged files (i.e unresolved conflicts) should only appear in the Unstaged area, and not "duplicated" in the Staged area.
Motivation:
NOTE: According to the docs for git-status "Short Format" and
--porcelainformat(s), the<XY>field values for unmerged paths (specifically) do NOT actually represent the Index & Working-tree states, INSTEAD they represent the states introduced by each HEAD in the merge (i.e Theirs & Ours, relative to Base).