From c6b4897a5d5157e565984b99b980f73079c1d2cd Mon Sep 17 00:00:00 2001 From: gsxdsm Date: Wed, 3 Jun 2026 15:26:49 -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 1bf26f4c94..1a4d14b03e 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 @@ -62,7 +62,7 @@ if (assertions.length === 0) { The merge diff shows **no trace** of the regression — the reverted logic lives in a region git never flagged. FN-5902 is silently undone and the diff passes review as a clean refactor. The mirror mistake (keeping main's block) drops the extraction and breaks the other call site that motivated it. -The collision class is not hypothetical or rare here: **four parallel branches bootstrapped or substantially extended `CONCEPTS.md` on the same day, each as a full-file write rather than an append** — so every one of them will hit this add/add when merging, until they all land. (session history) +The collision class is not hypothetical or rare here: **four parallel branches bootstrapped or substantially extended `CONCEPTS.md` on the same day, each as a full-file write rather than an append** — so every one of them will hit this add/add when merging, until they all land. ## When to Apply