clio-kit-resolve-merge-conflicts

Use when this workflow is requested: Resolves a merge, rebase, or cherry-pick stopped on conflicts by reconstructing both sides' intent, validating with the project's own checks, and completing the operation. Not for integrating many branches; use worktree-merge. Triggers on "merge conflict", "fix these conflicts".

License

Apache-2.0

Compatibility

Clio Coder procedures adapted for skill discovery. Host tools, external services and native Clio execution gates require separate configuration; see the host compatibility note.