docs: Add zdiff3 concept article - #96
Merged
Merged
Conversation
github-actions
Bot
changed the title
Contributor
|
🚀 Web preview: https://preview-96.treq-9zy.pages.dev |
cursor
Bot
force-pushed
the
cursor/zdiff3-article-6440
branch
from
July 27, 2026 11:31
01ab650 to
edee1c0
Compare
Ziinc
marked this pull request as ready for review
July 27, 2026 19:08
Document merge, diff3, and zdiff3 conflict presentation so readers can enable zealous Diff3 and interpret three-way conflict markers. Co-authored-by: Ziinc <Ziinc@users.noreply.github.com>
Shorten the conflict comparison setup line for clearer prose. Co-authored-by: Ziinc <Ziinc@users.noreply.github.com>
Rebased on main, confirmed the article passes the writing checker, and wired inbound/outbound links so zdiff3 is no longer orphaned or thin. Co-authored-by: Ziinc <Ziinc@users.noreply.github.com>
Correct the minimal-conflict overclaim and merge-style table, warn that regenerating conflicts overwrites edits, document the rebase ours/theirs swap, and cite the Git manuals for conflictStyle, restore, and markers. Co-authored-by: Ziinc <Ziinc@users.noreply.github.com>
cursor
Bot
force-pushed
the
cursor/zdiff3-article-6440
branch
from
July 27, 2026 19:12
4acd14e to
89c8f39
Compare
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.
Summary
Adds a learn concept article on Git's
zdiff3(Zealous Diff3) conflict style underweb/learn/concepts/git/, and links it from the Git concepts index.The article covers:
merge,diff3, andzdiff3present the same conflict differentlyzdiff3globally, per-repo, or for one conflicted file viagit restore --conflictours/theirslabeling, and marker-parsing caveats for botsAccuracy fixes
Addressed review findings before publish:
zdiff3often narrows edge matches, it does not guarantee a globally minimal conflictmergeis described as already able to move matching edge lines outsidegit restore --conflict=zdiff3and warned that it overwrites working-tree editsours/theirsswapconflict-marker-sizemerge.conflictStyle,git rebase,git restore, andgitattributesWriting and interlinking audit
Rebased onto latest
main(including the new rerere article). Ran/writingand/audit-interlinking:--strict)zdiff3orphan / thinTest plan
/learn/concepts/git/zdiff3python3 .claude/skills/writing/scripts/readability.py web/learn/concepts/git/zdiff3.mdx --strict