docs: apply/capture direction cues + conflict-resolution explanation#14
Merged
Conversation
added 3 commits
July 8, 2026 19:19
Adds direction cues to the apply and capture help (repo -> this machine vs this machine -> repo; a locally-edited file is left for capture, never overwritten) and a new Diataxis explanation page covering the four dotfile states (clean / repo-ahead / locally-drifted / conflict) and where conflicts resolve in each direction: apply refuses a conflict and points at capture or --force, capture routes each change shared/local or skips. Help strings only, no behaviour change; CLI reference regenerated.
# Conflicts: # CHANGELOG.md
# Conflicts: # CHANGELOG.md
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.
Non-breaking. Adds direction cues to the apply/capture help (repo -> this machine vs this machine -> the repo; a locally-edited file is left for capture, never overwritten) and a new Diataxis explanation page docs/explanation/reconciling-drift-and-conflicts.md covering the four dotfile states (clean / repo-ahead / locally-drifted / conflict) and where conflicts resolve per direction. Help strings + docs only, no behaviour change; CLI reference regenerated. build/vet/test + full evals green.