id: bcdfa6e5-2d0e-4c3e-9646-c192cdab199c title: 'bug: pr merge on landed PR reports conflict; SEC-08 hash mismatch' state: closed labels:
- dogfood assignees: [] milestone: null created: 2026-09-08T03:51:40Z updated: 2026-09-08T04:13:27Z
f0rge pr merge <uuid> on an already-merged PR: 'merge conflict' instead of 'already landed'. Root: branch payload hashes format-patch stdout; folder payload hashes stored patch.diff (pr create) — different bytes, landed() dedup misses. Also: branch-flow merges never flip canonical pr state to 'merged' (flip only in folder flow). Fix: canonical patch hash + flip canonical pr state on success in both flows.