Run interactive three-way merges for divergent skill or agent files.
npx skills add https://github.com/ckallum/calsuite --skill reconcile-ckallum
Please help me install this Agent Skill. Skill: reconcile Source: https://github.com/ckallum/calsuite/tree/main/.claude/skills/reconcile Command: npx skills add https://github.com/ckallum/calsuite --skill reconcile-ckallum
Thin wrapper around configure-claude.js --reconcile <path> that provides an interactive three-way merge for a single divergent skill/agent file. This skill adds pre-flight checks (calsuite reachable, EDITOR set, and the file is actually divergent) and post-run interpretation. The real merge UI is in the installer; this is just the polished entry point.
Invoke the reconcile sequence on a divergent file using the reconcile path with the installer.
High-intent search queries and answers about installing and using this skill.
A three-way merge for divergent files resolves conflicts between two modified versions of a file by comparing them against a common base, launching an interactive editor to manually reconcile differences.
To perform an interactive three-way merge on a single file, invoke the reconcile sequence on the divergent file path to launch the installer's merge UI with pre-flight validation and post-run outcome interpretation.
Running a three-way merge requires calsuite to be reachable and the EDITOR environment variable to be set, ensuring the interactive merge UI can launch properly for the target file.
This interactive three-way merge handles a single divergent file. For bulk reconciliation across multiple targets, you should use the /reconcile-targets workflow instead of the single-file entry point.
A file merge fails before opening if pre-flight checks detect calsuite is unreachable, EDITOR is not set, or the target file is not actually divergent, preventing the installer workflow from launching.
ckallumRun calsuite cross-target synchronization and parse divergence summaries.
adminsairolotech-bitRun post-merge setup scripts and reconcile workflows against .replit configuration.
ProjAnvilUpdate pbxproj references and groups for untracked files in Xcode projects.
assertchrisResolve Git merge conflicts file by file using a rebase strategy.
