Manifest Merge Conflicts

Resolve merge conflicts from upstream syncs or other merges. Preserves application identity while accepting framework and tooling improvements. Use when you see merge conflict markers or the user says "resolve conflicts", "fix merge", or "merge conflict".

hazat Updated

File contents

hazat/manifest commit 5a30529699

Frequently asked questions

npx get-skill add hazat/manifest-merge-conflicts