marius-kilocode 72a11b02af resolve merge conflicts

2026-06-10 20:03:42 +02:00

..

config.test.ts

feat: support HEAD as upstream merge base

2026-05-06 09:38:26 +00:00

config.ts

resolve merge conflicts

2026-06-10 20:03:42 +02:00

git.test.ts

refactor(upstream): improve compatibility commit lookup using semver

2026-05-06 14:34:13 +00:00

git.ts

Merge remote-tracking branch 'origin/main' into mark/upstream-compat-base

2026-05-07 16:12:34 +02:00

logger.ts

…

markers.ts

fix(upstream): stop finder hanging on big assets

2026-05-05 14:17:33 +02:00

match.ts

…

report.test.ts

chore: remove stale desktop package references

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

report.ts

chore: remove stale desktop package references

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

reset.ts

fix(upstream): pre-filter big + policy-protected files

2026-05-05 15:25:37 +02:00

upstream.ts

fix(upstream): rename shadowing path local in writeVersion

2026-05-11 08:51:59 +00:00

version.ts

…

worktree.ts

chore: add opencode merge reference worktrees

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