kiloconnect[bot] c239a6bb22 chore(config): enforce zdiff3 conflict style via postinstall ...

Add a new setup script to configure `merge.conflictStyle=zdiff3` locally
within the repository. This ensures that the common ancestor is visible
during merge conflicts, which is required for structural resolution by
`mergiraf` and simplifies manual conflict resolution.

The configuration is applied during `bun install` via the `postinstall`
hook and remains as a fallback for the upstream merge utilities.

2026-05-05 14:49:50 +00:00

..

config.ts

chore(upstream): skip files Kilo has removed from upstream

2026-05-05 10:27:26 +00:00

git.ts

chore(config): enforce zdiff3 conflict style via postinstall

2026-05-05 14:49:50 +00:00

logger.ts

feat: upstream script wip

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

markers.ts

fix(upstream): stop finder hanging on big assets

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

match.ts

fix: skip removed packages during upstream merge

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

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): pre-filter big + policy-protected files

2026-05-05 15:25:37 +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