mirror of
https://github.com/Kilo-Org/kilocode.git
synced 2026-08-28 19:11:03 +08:00
Mark IJbema
24146a2171
mergiraf exit 2 means it reduced conflicts but didn't fully close them. Previously we bailed on any non-zero exit, throwing away the useful partial reduction in the working tree. Now we always read the file after mergiraf runs: if no conflict markers remain we stage, if markers remain we keep the reduced content in the working tree for manual review but leave the file unstaged so nothing half-resolved is auto-committed. Also clean up the debug wording and surface a partial-resolution count in the normal log output.