Mark IJbema 24146a2171 fix(upstream): preserve partial mergiraf results without staging them ...

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.

2026-04-28 14:25:41 +02:00

..

github

fix: align stale bot message with actual 60-day threshold (#22842)

2026-04-16 11:01:35 -05:00

upstream

fix(upstream): preserve partial mergiraf results without staging them

2026-04-28 14:25:41 +02:00

beta.ts

resolve merge conflicts

2026-04-24 16:58:05 +02:00

changelog-github.cjs

fix: suppress 'Thanks' credit for kilo-code-bot app in changelog

2026-04-17 13:35:52 +00:00

changelog.ts

fix(provider): preserve additional model properties during merge

2026-04-13 13:13:02 +02:00

check-md-table-padding.ts

chore: exempt .opencode/glossary from md-table-padding check

2026-04-28 08:34:07 +00:00

check-opencode-annotations.ts

Merge pull request #8683 from Kilo-Org/glitter-neighbor

2026-04-09 14:01:07 -04:00

duplicate-pr.ts

refactor: kilo compat for v1.14.22

2026-04-24 14:18:25 +02:00

extract-source-links.ts

feat: implement codebase indexing (#6966)

2026-04-27 17:43:27 +02:00

format.ts

fix: revert sdk generation script change (#23133)

2026-04-17 13:33:11 -04:00

generate-cli-docs.ts

feat: auto-generate CLI reference docs from help.ts

2026-02-21 11:24:33 -07:00

generate.ts

fix: revert sdk generation script change (#23133)

2026-04-17 13:33:11 -04:00

hooks

ignore: python sdk (#2779)

2025-10-28 18:32:45 -05:00

publish-start.ts

docs: update default branch references from dev to main

2026-02-23 11:19:39 +01:00

publish.ts

Merge branch 'main' into imanolmaiztegui/kilo-opencode-v1.4.7

2026-04-22 09:44:37 +02:00

raw-changelog.ts

refactor: kilo compat for v1.14.22

2026-04-24 14:18:25 +02:00

release

feat(vscode): add pre-release publishing support to marketplace workflow

2026-04-02 13:48:45 +00:00

sign-windows.ps1

OpenCode v1.3.4 (#8798)

2026-04-12 13:36:08 +02:00

stats.ts

refactor: kilo compat for v1.14.22

2026-04-24 14:18:25 +02:00

sync-zed.ts

ci: update fork_repo var

2026-01-08 14:19:44 -06:00

version.ts

fix(version): remove --target flag from beta release creation (#23403)

2026-04-19 17:05:03 +08:00