id: e221d8ed-d5c8-4aed-8873-8acb0d6f02c2 title: 'merge branch: fork-drifted diff can silently delete shared .forge/prs records' state: closed labels:
- dogfood
- pri assignees: [] milestone: null created: 2026-09-08T04:42:15Z updated: 2026-09-08T05:58:05Z
Evidence: dog-issue forked before dog-pr merged; its main..head diff contained deletions of already-landed PR records (t1/t2/78e0c97e folders); orchestrator avoided data loss by merging the folder payload (disjoint range) instead of the branch diff. Acceptance: merging a branch whose base predates other landings must NOT silently delete forge state; deletions of .forge/prs/* surface as conflicts (file list + stop), never applied silently. File: cmd/merge.rs (base-aware diff / deletion surfacing). Bitter-lesson: no merge engine, no auto-resolution — surface the conflict, list files, stop; the reconciling agent decides.