marius-kilocode 0e19a61e49 fix: apply patchedDependencies pruning on every package.json path ...

The pruning was only wired into the conflict-resolution path, but the
unconditional pre-merge pass and the ref reconciler kept the naive
additive merge, so stale upstream patch entries survived whenever the
root package.json did not hit a git conflict. Extract
prunePatchedDependencies and call it before the preserve loop in all
three paths.

2026-07-21 13:13:57 +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

chore: remove stale desktop package references

2026-05-04 15:00:59 +00:00

package-names.ts

fix(upstream): ignore branding-only marker diffs

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

preserve-versions.test.ts

fix: preserve Kilo identity after upstream merge

2026-06-01 16:58:26 +02:00

preserve-versions.ts

fix: preserve Kilo identity after upstream merge

2026-06-01 16:58:26 +02:00

skip-files.test.ts

chore(monorepo): remove stats package and align upstream skip rules

2026-06-19 11:01:30 +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

chore: remove stale desktop package references

2026-05-04 15:00:59 +00:00

transform-package-json.test.ts

fix: apply patchedDependencies pruning on every package.json path

2026-07-21 13:13:57 +02:00

transform-package-json.ts

fix: apply patchedDependencies pruning on every package.json path

2026-07-21 13:13:57 +02: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

chore: remove stale desktop package references

2026-05-04 15:00:59 +00:00

transform-web.ts

chore: remove stale desktop package references

2026-05-04 15:00:59 +00:00