What problem does it solve? Applications generated with pnpm create @nocobase/app have no link back to their template, so template improvements never arrive automatically. This Skill performs a three-way merge between the baseline template release, the target release, and the user's application, deciding file by file how template changes land without destroying user customizations. ## Core Features & Use Cases - Three-way template diffing: Compares BASE and TARGET template releases, then checks which of those files the user also modified, producing a per-file merge plan. - Edge-case handling: Covers package.json key-by-key merging, plugin composition roots, removed plugin usage reviews, migrations, and generated directories via the references guide. - Safe upgrade workflow: Enforces a Git branch with a clean tree, forbids destructive commands, and finishes with install, dedupe, typecheck, test, lint, and build verification. - Use Case: A team wants to move their NocoBase hub application from template version 1.2.0 to 1.5.0 without losing their custom pages, plugins, and configuration. The Skill diffs the two template releases, identifies contested files, agrees a plan with the user, and merges the changes safely. ## Quick Start Upgrade this application to the latest template release, preserving all of my customizations and verifying the result with typecheck and tests.