From 772d08ee8de194527281bf2684610f7507e25ff9 Mon Sep 17 00:00:00 2001 From: gsxdsm Date: Wed, 3 Jun 2026 15:26:28 -0700 Subject: [PATCH] Update docs/solutions/best-practices/merge-conflict-extraction-vs-semantics-and-parallel-bootstrap.md Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com> --- ...e-conflict-extraction-vs-semantics-and-parallel-bootstrap.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/solutions/best-practices/merge-conflict-extraction-vs-semantics-and-parallel-bootstrap.md b/docs/solutions/best-practices/merge-conflict-extraction-vs-semantics-and-parallel-bootstrap.md index 9207b72519..1bf26f4c94 100644 --- a/docs/solutions/best-practices/merge-conflict-extraction-vs-semantics-and-parallel-bootstrap.md +++ b/docs/solutions/best-practices/merge-conflict-extraction-vs-semantics-and-parallel-bootstrap.md @@ -39,7 +39,7 @@ Observed merging `main` into `gsxdsm/missonsdebug` (merge `60c307320`): the bran 3. **Port the incoming semantic change into the helper body** at its new home — do not accept either hunk verbatim. 4. **Sweep the moved code's documentation** — a doc comment or glossary entry describing the old behavior is now a lie; fix it in the same merge. 5. **Run the merged (union) test suite + typecheck**, not just one branch's tests — the merge creates a combination neither branch tested. -6. **Name the merge commit after the adopted change** (e.g. `Merge main: adopt FN-5902 lazy assertion linkage in shared runFeatureValidation`), not a bare `merge main`. (auto memory [claude]) +6. **Name the merge commit after the adopted change** (e.g. `Merge main: adopt FN-5902 lazy assertion linkage in shared runFeatureValidation`), not a bare `merge main`. For **accretive docs** (`CONCEPTS.md`, glossaries, registries) hitting add/add: **merge as a union** — clusters are independent; keep one preamble. For near-identical pointer lines (e.g. `AGENTS.md` references), take the wording that minimizes the diff. Then sweep the merged prose for statements the incoming commits falsified.