reconcile-targets

Identify and resolve divergences between target repos and the calsuite distribution.

Updated Feb 8, 2026
One-click install
npx skills add https://github.com/ckallum/calsuite --skill reconcile-targets
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: reconcile-targets
Source: https://github.com/ckallum/calsuite/tree/main/skills/reconcile-targets
Command: npx skills add https://github.com/ckallum/calsuite --skill reconcile-targets

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Reconcile calsuite divergences across target repositories by surfacing, summarizing, and guiding resolution for each divergence, enabling deliberate upstream, cross-port, or local-only decisions rather than blind fixes.

Core Features & Use Cases

  • Surface divergences detected during mechanical sync and present clear context for review.
  • Generate side-by-side summaries and route users through upstream, cross-port, keep-local, adopt, or three-way merge workflows.
  • Coordinate changes across multiple targets with safe-overwrite rules and a staged PR-based workflow.

Quick Start

Run the reconcile-targets skill after a sync to guide divergence resolution.

Frequently Asked Questions about reconcile-targets

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
How do I resolve divergences between target repos and the calsuite distribution after a sync?

To resolve calsuite divergences after a sync, the workflow surfaces conflicts and generates side-by-side summaries. This process guides you through upstream, cross-port, or local-only decisions rather than applying blind fixes to your target repositories.

What is the best way to handle multiple target repositories with divergent git changes?

Handling divergent changes across multiple target repositories requires orchestrating cross-target divergences with care. You can generate agent-assisted summaries to route changes through staged PR-based workflows, ensuring safe-overwrite rules are followed during resolution.

How does a three-way merge workflow apply to calsuite cross-port conflicts?

A three-way merge workflow for calsuite cross-port conflicts uses agent-assisted summaries to guide decisions. It compares the divergent target repositories against the original distribution, enabling deliberate adopt or keep-local resolutions within a staged PR-based workflow.

Do I need a config/targets.json file to reconcile calsuite divergences?

Yes, you need the config/targets.json file to reconcile calsuite divergences. The resolution process also requires access to the _origin frontmatter in stamped files to accurately identify and resolve sync conflicts across your target repositories.

When should I use a manual reconciliation workflow instead of a mechanical sync?

You should use a manual reconciliation workflow instead of a mechanical sync when multiple targets have divergent changes requiring thoughtful resolution. It prevents blind fixes by generating side-by-side summaries that guide deliberate upstream, cross-port, or local-only decisions.