nthfuncx/nanoclaw
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
gavrielc
2026-03-11 12:25:14 +02:00
parent 0cfdde46c6
commit 1f2e930d16
11 changed files with 51 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.claude/skills/add-telegram/SKILL.md
View File

@@ -39,7 +39,11 @@ git remote add telegram https://github.com/qwibitai/nanoclaw-telegram.git
```bash
git fetch telegram main
git merge telegram/main
git merge telegram/main || {
git checkout --theirs package-lock.json
git add package-lock.json
git merge --continue
}
```
This merges in: