issues: file #21 conflict-output richness (merge flow)

diff --git a/.forge/issues/ef796fed-f96d-480e-af29-4f22e46fd72c/issue.md b/.forge/issues/ef796fed-f96d-480e-af29-4f22e46fd72c/issue.mdnew file mode 100644index 0000000..248353b--- /dev/null+++ b/.forge/issues/ef796fed-f96d-480e-af29-4f22e46fd72c/issue.md@@ -0,0 +1,13 @@1+---2+id: ef796fed-f96d-480e-af29-4f22e46fd72c3+title: 'merge conflict output: file names only; reconciler needs hunks/context'4+state: open5+labels:6+- dogfood7+- pri8+assignees: []9+milestone: null10+created: 2026-09-08T04:52:27Z11+updated: null12+---13+Evidence: `f0rge merge` conflict path parses `git apply --check` stderr into a filename list, then one-line error "merge conflict: <files>". The reconciling agent must re-derive both sides by hand (git diff base..head, manual 3-way). Fix within cmd/merge.rs conflict path, NO machinery (bitter lesson: no auto-resolve, no merge engine): attach per-file conflict context to the merge record body (both sides"\ hunks / 3-way context) so the resolving agent can act on the record alone. Error line stays one line; richer detail lives in the merge record body (+ optional conflict sidecar in the record). Acceptance: after a conflicted merge, the fail record body contains per-file conflict context and a fresh agent can resolve without re-running git diff. Cross-refs #15/#17/#20 (same merge-flow cluster, coordinate — likely one PR).