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

docs: note that workflow removal recurs on every forward merge

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

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

@@ -37,7 +37,7 @@ 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: # 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 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