Mark IJbema a16e0560c7 Merge remote-tracking branch 'origin/main' into markijbema/kilo-opencode-v1.14.29

2026-05-04 10:27:37 +02:00

..

config.ts

fix(cli): skip .github/VOUCHED.td and surface git rm errors in upstream merge

2026-04-28 13:05:57 +02:00

git.ts

feat(upstream): use zdiff3 conflict markers during upstream merge

2026-04-28 14:35:50 +02:00

logger.ts

feat: upstream script wip

2026-02-05 13:31:15 -03:00

match.ts

fix: skip removed packages during upstream merge

2026-04-29 11:50:14 +02:00

report.test.ts

fix: keep kilo directories during upstream merge

2026-04-29 13:36:35 +02:00

report.ts

resolve merge conflicts

2026-04-30 16:25:46 +02:00

version.ts

feat: upstream script wip

2026-02-05 13:31:16 -03:00

worktree.ts

chore: add opencode merge reference worktrees

2026-04-29 16:06:32 +00:00