gavrielc 1f2e930d16 fix: auto-resolve package-lock conflicts when merging forks ...

Instead of failing on package-lock.json merge conflicts, take the
fork's version and continue. Applied to all channel skill merge
instructions and CLAUDE.md troubleshooting.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

2026-03-11 12:25:14 +02:00

..

SKILL.md

fix: auto-resolve package-lock conflicts when merging forks

2026-03-11 12:25:14 +02:00