Reconcile upstream code and local project documentation without losing evidence
The September 8 Reconcile main and docs task joined 26 upstream commits with 20 locally changed files in Shopify Headless. Its final source checkpoint reports six documentation conflicts resolved, the V45 pilot renumbered to 1188, indexes refreshed, and a clean synchronized checkpoint at 57f30e43. The reusable Context Layer method is to inventory and preserve work before integration, settle conflicting project ownership, then verify both source evidence and the documents future agents will use.
Workflow steps
- 1
Inventory branch, upstream, dirty files and evidence before integration
Action
- 2
Review overlapping project IDs and authoritative source context
Decision
- 3
Integrate upstream and resolve docs conflicts by preserving meaning
Process
- 4
Refresh lifecycle folders, roadmap, changelog and indexes together
Action
- 5
Run docs checks and explicit evidence-preservation checks
Action
- 6
Operator reviews the final checkpoint and next handoff
Decision