Skip to content

v1.4.0 · Resolving Merge Conflicts removed

Choose a tag to compare

@jonathankems jonathankems released this 11 Oct 09:54
8025715

Removed

  • resolving-merge-conflicts. submit, deploy, and execute resolve 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-conflicts

Add -g if you installed the skills globally.