From 8c4ab36ef2d534f75190a4f852b50a12889c205e Mon Sep 17 00:00:00 2001 From: gavrielc Date: Sat, 28 Mar 2026 15:05:57 +0300 Subject: [PATCH] docs: update fork maintenance guide with merge learnings Co-Authored-By: Claude Opus 4.6 (1M context) --- docs/BRANCH-FORK-MAINTENANCE.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/BRANCH-FORK-MAINTENANCE.md b/docs/BRANCH-FORK-MAINTENANCE.md index a3772fd..9272818 100644 --- a/docs/BRANCH-FORK-MAINTENANCE.md +++ b/docs/BRANCH-FORK-MAINTENANCE.md @@ -37,6 +37,8 @@ git fetch nanoclaw-whatsapp git checkout -B whatsapp-merge nanoclaw-whatsapp/main git merge main # 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 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 | | `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