From a3fb3beb6ac28757e0a3dbe3b64862cd4839f8ce Mon Sep 17 00:00:00 2001 From: gavrielc Date: Sat, 28 Mar 2026 15:59:57 +0300 Subject: [PATCH] docs: warn about silently wrong auto-merges in maintenance guide 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 59a398880..4891f381e 100644 --- a/docs/BRANCH-FORK-MAINTENANCE.md +++ b/docs/BRANCH-FORK-MAINTENANCE.md @@ -61,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 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. +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. **Always build and test after every forward merge** — auto-merged code can be silently wrong (e.g. referencing a renamed function or using a removed parameter) even when git reports no conflicts. ## When to merge forward