kiloconnect[bot] 419ddea52a chore(upstream): implement compatibility base tracking for merges ...

Update the upstream merge script to identify and link to the previous compatibility commit. This ensures that pre-merge transformations maintain a proper commit history by using multiple parents when a prior compatibility base is found, rather than creating disconnected commits.

- Add `findLatestCompatCommit` to locate previous compatibility commits
- Implement `commitTree` and `updateBranch` for low-level git manipulation
- Update `merge.ts` to integrate compatibility base detection and multi-parent commits

2026-05-04 14:06:37 +00: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

chore(upstream): implement compatibility base tracking for merges

2026-05-04 14:06:37 +00:00

logger.ts

…

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