From ebc746e93705245cbc9d35426b22ec63cb4d15df Mon Sep 17 00:00:00 2001 From: Eureka Date: Thu, 8 Oct 2026 14:15:51 +0200 Subject: [PATCH] SKILL: a long-lived branch merge can break semantically with no conflict Co-Authored-By: Claude Opus 5.5 --- SKILL.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/SKILL.md b/SKILL.md index ceae7f2..91dae7b 100644 --- a/SKILL.md +++ b/SKILL.md @@ -636,6 +636,9 @@ Scripts that know a project's layout stay in that project. - **Before a merge, verify every test project that consumes the changed package, not only the package's own.** CultMath Phacelle merged on CultMath's green suite (2026-09-30); Caching checks every public CultMath value type for a converter, formatter and dictionary key, and main went red. +- **A merge of a long-lived branch can break semantically with no textual + conflict** (the LookDirection to Aim rename, 2026-10-07). Dispatch a merge Hands + that verifies and fixes mechanical adaptations only. - **Pin sibling checkouts with a guard that checks revision and cleanliness.** Scope the guard to projects that actually reference the sibling.