Repository navigation
v1.4.0 · Resolving Merge Conflicts removed
Removed
resolving-merge-conflicts.submit,deploy, andexecuteresolve conflicts themselves: they preserve both sides' intent and stop to ask when the intent is unclear.
Updating existing repositories
npx skills update leaves the removed skill installed and reports it as failed. To remove it, run:
npx skills remove resolving-merge-conflictsAdd -g if you installed the skills globally.