Make AI merge-conflict fixes stop at a reviewable proposal by default, with per-file diffs, risk and reasoning that a head-branch writer can accept and apply, while keeping the one-shot auto fix behind an explicit mode or a repo opt-in that the merge queue also honours.
16 files changed+647−135
Rendering diff…