migrate-nanoclaw

To avoid merge conflicts when upgrading a fork, extract your customizations into a replayable migration guide and reapply them on a clean upstream checkout. This intent-based approach documents your changes and replays them in a validated order instead of merging branches.

An intent-based migration guide captures the reasoning, implementation details, and code snippets behind your fork customizations. It allows future sessions to reproduce your personalized configs, personas, and scripts on a fresh upstream checkout without guessing.

You reapply custom code to a clean upstream checkout by spinning up git worktrees and reintroducing your customizations in a validated order. The process keeps backups and diagnostics intact while replaying your documented intent.

Yes, this migration workflow supports git worktrees and backups. It spins up worktrees to test upgrades safely, reapplies upstream skill branches, and maintains safety gates and diagnostics throughout the reapplication process.

The best way to preserve custom skills during an upstream refactor is to extract their intent and implementation into a migration guide. You can then safely reintroduce your personalized skills and custom code onto the latest upstream commit in a clean environment.

You need a migration guide instead of standard git merges because upstream refactors often conflict with local tweaks. A migration guide captures intent and replays customizations on a clean checkout, avoiding painful merge conflicts and ensuring validated reapplication.