From 3ab833b4eb7a1a210a5c22c3c9118898dd1a6ecd Mon Sep 17 00:00:00 2001 From: gavrielc Date: Sat, 28 Mar 2026 15:14:07 +0300 Subject: [PATCH] docs: note that workflow removal recurs on every forward merge Co-Authored-By: Claude Opus 4.6 (1M context) --- docs/BRANCH-FORK-MAINTENANCE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/BRANCH-FORK-MAINTENANCE.md b/docs/BRANCH-FORK-MAINTENANCE.md index 9272818..59a3988 100644 --- a/docs/BRANCH-FORK-MAINTENANCE.md +++ b/docs/BRANCH-FORK-MAINTENANCE.md @@ -37,7 +37,7 @@ 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: +# Remove upstream-only workflows (re-added by every merge since main has them): 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