fix: show conflict markers in status diff view#2937
Open
leno23 wants to merge 1 commit into
Open
Conversation
libgit2 reports merge conflicts as Delta::Conflicted but does not emit patch hunks via diff.print. Treat Conflicted like untracked files by building a patch from the on-disk worktree so conflict markers appear in the status diff view (gitui-org#2865). Co-authored-by: Cursor <cursoragent@cursor.com>
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
1 participant
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.
Summary
When a merge leaves unmerged paths,
git2reportsDelta::Conflictedfordiff_index_to_workdir, butdiff.print(DiffFormat::Patch)emits no hunks. The status tab therefore showed an empty diff (incorrect file size only).This change reuses the existing untracked-file path: build a patch from the on-disk worktree file so conflict markers (
<<<<<<<,=======,>>>>>>>) are visible in the diff panel.Test plan
cargo test -p asyncgit test_merge_conflict_workdir_diffcargo test -p asyncgit sync::diff::testsFixes #2865
Made with Cursor