Mark IJbema 702c471d61 Merge pull request #9678 from Kilo-Org/mark/upstream-skip-globs ...

fix: handle skipped and Kilo-only paths in upstream merges

2026-04-29 16:24:54 +02:00

..

keep-ours.test.ts

fix: keep kilo directories during upstream merge

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

keep-ours.ts

fix: keep kilo directories during upstream merge

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

lock-files.ts

refactor: improve nix hashes resolution

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

package-names.ts

fix(upstream): ignore branding-only marker diffs

2026-04-29 10:14:30 +00:00

preserve-versions.ts

feat: upstream script wip

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

skip-files.test.ts

fix: skip removed packages during upstream merge

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

skip-files.ts

fix: skip removed packages during upstream merge

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

transform-extensions.ts

refactor: consider kilocode change markers on merge

2026-03-17 07:27:25 -03:00

transform-i18n.ts

refactor: consider kilocode change markers on merge

2026-03-17 07:27:25 -03:00

transform-package-json.ts

feat: test runner

2026-04-15 15:11:33 -03:00

transform-scripts.ts

chore(upstream): update release artifact name replacements in transform scripts

2026-04-29 12:46:47 +00:00

transform-take-theirs.ts

fix: update Kilo-Org/kilo references to Kilo-Org/kilocode

2026-03-30 13:58:12 +00:00

transform-tauri.ts

refactor: consider kilocode change markers on merge

2026-03-17 07:27:25 -03:00

transform-web.ts

refactor: consider kilocode change markers on merge

2026-03-17 07:27:25 -03:00