Mark IJbema
23818a5127
Merge pull request #9896 from Kilo-Org/mark/skip-team-members
...
chore(upstream): skip files Kilo has removed from upstream
2026-05-05 12:49:41 +02:00
kiloconnect[bot]
6986b2b879
chore(upstream): skip files Kilo has removed from upstream
...
Add .github/TEAM_MEMBERS and other files Kilo has deleted to skipFiles
so future upstream merges auto-remove them via git rm instead of
surfacing delete-by-us conflicts that need manual resolution.
Also drop the stale github/.gitignore entry from keepOurs (the file
does not exist in Kilo main; keepOurs was a no-op) and move it to
skipFiles so upstream's copy is dropped on merge instead of added.
2026-05-05 10:27:26 +00:00
Mark IJbema
33891196c7
Merge pull request #9895 from Kilo-Org/mark/release-slack-prerelease-status
...
fix: show release type in Slack notifications
2026-05-05 12:15:27 +02:00
Mark IJbema
e77c6c005a
Merge pull request #9889 from Kilo-Org/mark/reset-file-to-upstream
...
Add reset-to-upstream helper
2026-05-05 11:29:48 +02:00
kiloconnect[bot]
47cab6b3df
fix: show release type in Slack notifications
2026-05-05 09:12:27 +00:00
kilo-maintainer[bot]
8fcc77a2ae
release: v7.2.40
2026-05-05 09:05:27 +00:00
kilo-maintainer[bot]
4e1bae01ae
release: v7.2.39
2026-05-05 08:30:11 +00:00
kiloconnect[bot]
b59dfaa642
fix: preserve binary upstream resets
2026-05-05 08:28:57 +00:00
kiloconnect[bot]
6e3ddaad60
feat: add reset-to-upstream script
2026-05-05 08:19:17 +00:00
Mark IJbema
0364cda447
Merge remote-tracking branch 'origin/main' into mark/remove-oc-desktop-apps
2026-05-05 09:05:38 +02:00
kilo-maintainer[bot]
fa7082fcf8
release: v7.2.36
2026-05-05 00:11:27 +00:00
kilo-maintainer[bot]
a0d657fc65
release: v7.2.35
2026-05-04 16:10:20 +00:00
kiloconnect[bot]
837a62152a
chore: annotate shared package removals
2026-05-04 15:13:13 +00:00
kiloconnect[bot]
d22d08bbce
chore: remove stale desktop package references
2026-05-04 15:00:59 +00:00
Mark IJbema
7923c87f24
Merge pull request #9834 from Kilo-Org/docs/verification-copy-prompts
...
docs: add copyable verification prompts
2026-05-04 14:21:55 +02:00
Mark IJbema
6b4bc40b81
Merge pull request #9751 from Kilo-Org/markijbema/kilo-opencode-v1.14.29
...
Merge opencode v1.14.29
2026-05-04 14:21:23 +02:00
kiloconnect[bot]
d066277079
docs: use safer verification commands
2026-05-04 12:09:16 +00:00
kiloconnect[bot]
97af82d217
docs: add copyable verification prompts
2026-05-04 11:54:14 +00:00
kiloconnect[bot]
5753243a30
docs: add verification startup commands
2026-05-04 10:13:05 +00:00
kiloconnect[bot]
69d6ece6f1
docs: add upstream verification test checklist
2026-05-04 10:03:20 +00:00
Mark IJbema
a16e0560c7
Merge remote-tracking branch 'origin/main' into markijbema/kilo-opencode-v1.14.29
2026-05-04 10:27:37 +02:00
kilo-maintainer[bot]
a1c08dbca4
release: v7.2.34
2026-05-04 03:38:53 +00:00
kilo-maintainer[bot]
5bf9e821e9
release: v7.2.33
2026-05-01 16:49:11 +00:00
Mark IJbema
3f7037549e
resolve merge conflicts
2026-04-30 16:25:46 +02:00
kiloconnect[bot]
8185b01e51
chore(cli): require ripgrep for find-conflict-markers
...
Drop the POSIX grep fallback; bail with a clear error when rg is
missing.
2026-04-30 10:18:35 +00:00
kiloconnect[bot]
2eec02452b
chore(cli): add script to find merge conflict markers in a file
...
Provides a small helper for upstream merge workflows so agents can be
allowlisted to search for conflict markers without needing general shell
access. Wraps the canonical ripgrep invocation with a POSIX grep fallback.
2026-04-30 10:08:23 +00:00
Mark IJbema
12f7967ca4
Merge pull request #9707 from Kilo-Org/agent/opencode-merge-worktrees
...
Add opencode merge reference worktrees
2026-04-30 11:19:47 +02:00
Marian Alexandru Alecu
34b1dee811
Merge pull request #9626 from Kilo-Org/fix/external_directory-permissions
...
fix(cli): honor read-only external directory allows
2026-04-29 23:25:06 +03:00
kilo-maintainer[bot]
3728b9081a
release: v7.2.31
2026-04-29 18:20:48 +00:00
kiloconnect[bot]
26046c9b2b
chore: add opencode merge reference worktrees
2026-04-29 16:06:32 +00:00
Mark IJbema
7d375b93ee
refactor: kilo compat for v1.14.29
2026-04-29 17:24:20 +02:00
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
Mark IJbema
8d91d99b01
Merge pull request #9674 from Kilo-Org/mark/upstream-kilocode-markers
...
feat(upstream): add kilocode marker fixer
2026-04-29 15:18:12 +02:00
Alex Alecu
60bac86696
fix: handle CI symlinks and config paths
2026-04-29 15:51:16 +03:00
kiloconnect[bot]
1520c05fb1
chore(upstream): update release artifact name replacements in transform scripts
2026-04-29 12:46:47 +00:00
kiloconnect[bot]
40ace50a5c
fix(upstream): support css marker comments
2026-04-29 12:33:08 +00:00
kilo-maintainer[bot]
ec57af1128
release: v7.2.30
2026-04-29 12:28:57 +00:00
kiloconnect[bot]
cc143380d7
fix(upstream): ignore orphan marker comments
2026-04-29 12:19:45 +00:00
kiloconnect[bot]
0bfc6eb422
fix(upstream): keep existing block markers
2026-04-29 12:08:01 +00:00
kiloconnect[bot]
050264e884
fix(upstream): collapse adjacent marker blocks
2026-04-29 11:54:03 +00:00
kiloconnect[bot]
d5966e2e88
fix(upstream): preserve existing marker comments
2026-04-29 11:42:57 +00:00
Mark IJbema
415f892c56
fix: keep kilo directories during upstream merge
2026-04-29 13:36:35 +02:00
Alex Alecu
3e3ec93991
fix(kilo-docs): normalize source link extraction on Windows
2026-04-29 14:15:42 +03:00
kiloconnect[bot]
e5c45b958e
fix(upstream): strip only actual marker comments
2026-04-29 10:21:11 +00:00
kiloconnect[bot]
f3a398cd7d
fix(upstream): ignore branding-only marker diffs
2026-04-29 10:14:30 +00:00
kiloconnect[bot]
4290cbcff5
fix(upstream): harden kilocode marker fixer
2026-04-29 09:54:29 +00:00
Mark IJbema
bb06f4d2ac
fix: skip removed packages during upstream merge
2026-04-29 11:50:14 +02:00
kiloconnect[bot]
c2d0553134
feat(upstream): add kilocode marker fixer
2026-04-29 09:36:07 +00:00
kirillk
3b88d2a5ce
fix(cli): include shell scripts in annotation check
2026-04-28 12:33:40 -04:00
kirillk
cf80826d5b
fix(cli): check annotations across shared upstream paths
2026-04-28 12:09:37 -04:00
Mark IJbema