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

docs: update fork maintenance guide with merge learnings

Browse Source 
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
gavrielc
2026-03-28 15:05:57 +03:00
parent 8bb8e036e4
commit 8c4ab36ef2
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/BRANCH-FORK-MAINTENANCE.md
View File

@@ -37,6 +37,8 @@ git fetch nanoclaw-whatsapp
git checkout -B whatsapp-merge nanoclaw-whatsapp/main git checkout -B whatsapp-merge nanoclaw-whatsapp/main
git merge main git merge main
# Resolve conflicts (see below) # Resolve conflicts (see below)
# Remove upstream-only workflows if they were re-added by the merge:
git rm .github/workflows/bump-version.yml .github/workflows/update-tokens.yml 2>/dev/null
git push nanoclaw-whatsapp HEAD:main git push nanoclaw-whatsapp HEAD:main
git checkout main && git branch -D whatsapp-merge git checkout main && git branch -D whatsapp-merge
@@ -59,7 +61,7 @@ The same files conflict every time:
| `.env.example` | Combine: main's entries + fork/branch-specific entries | | `.env.example` | Combine: main's entries + fork/branch-specific entries |
| `repo-tokens/badge.svg` | Take main's version (auto-generated) | | `repo-tokens/badge.svg` | Take main's version (auto-generated) |
Source code merges cleanly because forks/branches primarily add files rather than modifying shared code. Source code changes (e.g. `src/types.ts`, `src/index.ts`) usually auto-merge cleanly, but can conflict if both sides modify the same lines. Build and test after every forward merge.
## When to merge forward ## When to merge forward