How to use
- Copy the installation command and review the source package before installing it in your own agent environment.
- Check the source document for required tools, credentials and supported hosts.
- Describe your input and desired deliverable; review the output against the source material.
npx skills add https://github.com/victorzhuk/skills --skill z-merge-conflictsBefore you start
- Installation does not include a model subscription, API allowance or permission to access your files.
- Repository stars and installation counts describe activity, not an independent quality or security test.
Original skill document
Rendered from the source repository. Headings, examples, code, tables, links, and referenced images are preserved.
Merge conflicts
Resolve by intent and preserve unrelated work.
Process
- Identify the merge, rebase, or cherry-pick and its current commit. Record conflicting paths and pre-existing staged and unstaged changes.
- Read each side's commits and relevant PRs or tickets. Explain why each change exists.
- Preserve both intents where possible. Resolve incompatible behavior using the caller's stated goal; escalate a decision the evidence cannot settle.
- Run applicable project checks through its wrappers and resource limits. Fix what the resolution broke.
- Stage resolved paths explicitly. Inspect the entire staged diff against the initial state. Do not incorporate unrelated staged work into a commit.
- Continue the actual operation within the caller's authorization. Use the correct merge, rebase, or cherry-pick continuation and report remaining conflicts.
Do not
- Select ours/theirs wholesale without reading both intents.
- Invent behavior neither side requested.
- Stage every modified file.
- Abort merely to avoid resolving a conflict. Explicit user cancellation can authorize aborting after preserving recoverable work.
- Treat marker-like test fixtures as unresolved conflicts without inspection.
Verify
git diff --name-only --diff-filter=Uhas no unresolved paths.- Changed files contain no unintended conflict markers.
- Staged changes include only intended resolutions and already-authorized work.
- Project checks pass and
git statusconfirms the intended operation completed.
see [[z-verify-before-done]], [[z-testing-strategy]]
