chore(upstream): auto-resolve conflicts with mergiraf + zdiff3 markers - #9624

Merged

markijbema merged 6 commits into

mainfrom

mark/upstream-mergiraf

Apr 28, 2026

Commits on Apr 28, 2026

chore(upstream): run mergiraf on conflicted files during upstream merge

kilo-code-bot[bot]
authored and
Mark IJbema
committed
815e44a
fix(upstream): make runMergiraf resilient to per-file failures
Mark IJbema
committed
37b4440
fix(upstream): preserve partial mergiraf results without staging them
Mark IJbema
committed
24146a2
chore(upstream): disable mergiraf .orig backups
Mark IJbema
committed
e6f387e
feat(upstream): use zdiff3 conflict markers during upstream merge
Mark IJbema
committed
80d848d
fix(upstream): skip mergiraf for non-textual conflicts (delete/modify, binary)
Mark IJbema
committed
98654b2