resolve-conflictslisted

# Resolve Conflicts ## Core Question What conflict resolution preserves the intended changes from all relevant sides, avoids unrelated staging, and can be verified before continuation? ## When To Use Use this skill when: - `git status` shows unmerged paths, - conflict markers exist, - merge, rebase, cherry-pick, or revert is in progress, - the user asks to inspect, explain, resolve, stage, or continue after conflicts. ## When Not To Use Do not use this skill for branch sync before conflicts exist, destructive recovery, ordinary commit splitting, or tag/version/release work. Route to: - `branch-workflow` for starting sync, pull, merge, or rebase before conflicts exist. - `undo-recover` for abort, reset, clean, reflog, destructive recovery, or broad unstaging by default. - `atomic-commits` after conflicts are resolved and the user wants commits organized. - `conventional-commits` for message-only work. ## Required Evidence Before resolution, inspect or establish: - `git status --short --branch`, - current operation type: merge, rebase, cherry-pick, or revert, - unmerged path list, - conflict markers and conflicted file contents, - ours/theirs/base versions when needed, - semantic context around each conflict, - generated-file or lockfile policy, - relevant tests/build commands when discoverable, - secret-like values in conflict text. ## Operating Contract This skill owns conflict inventory, explanation, file-level resolution, validation, staging of resolved files,