mirror of
https://github.com/Kilo-Org/kilocode.git
synced 2026-08-29 03:44:06 +08:00
Mark IJbema
98654b289a
Files in UD/DU/binary/etc. conflict states have no <<<<<<< markers in the working tree. My earlier simplification that removed the `git checkout --conflict=diff3` pre-check caused mergiraf to run on them: it would exit 0 (nothing to solve), after which the unconditional `git add` silently staged our side as resolved, losing the signal that upstream deleted the file (or that we deleted what upstream modified). Guard runMergiraf by inspecting the file before calling mergiraf: if there are no conflict markers, skip the file entirely so it falls through to manual review. Surface a skipped-count line in the normal log output so the operator can see how many non-textual conflicts were left alone.