docs: Add zdiff3 concept article#96
Draft
Ziinc wants to merge 2 commits into
Draft
Conversation
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>
github-actions
Bot
changed the title
Contributor
|
🚀 Web preview: https://preview-96.treq-9zy.pages.dev |
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 fileWritten in the treq docs voice per
/writing(style guide + readability checker: Flesch ~61, no hard bans or AI tells).Test plan
/learn/concepts/git/zdiff3python3 .claude/skills/writing/scripts/readability.py web/learn/concepts/git/zdiff3.mdx --strict