Commit Graph
14 Commits
Author SHA1 Message Date
Catriel Müller eb662661ca feat: enable git rerere 2026-03-17 07:46:48 -03:00
Catriel Müller c29dcdcc60 refactor: clean kilo artifacts before compat commit 2026-03-17 07:46:48 -03:00
Catriel Müller c0a3b2f325 fix: fix sdk generation // vscode test 2026-03-17 07:27:25 -03:00
Catriel Müller 5b796226c3 refactor: consider kilocode change markers on merge 2026-03-17 07:27:25 -03:00
Mark IJbema 9a0ac0c0ee docs: update default branch references from dev to main
- Update AGENTS.md to reflect main as default branch
- Update GitHub Actions workflows to trigger on main branch
- Update publish scripts to cherry-pick from origin/main
- Update upstream merge scripts and documentation
- Update CONTRIBUTING.md links in PR standards workflow
- Fix disabled workflow and documentation links

All development commands (bun dev, npm run dev) and external services
(models.dev, ai-sdk.dev) remain unchanged as they are unrelated to branch names.
2026-02-23 11:19:39 +01:00
Catriel Müller 85ffa660f1 feat: add support for base branch 2026-02-05 13:31:47 -03:00
Catriel Müller 1e18ea466c refactor: improve lock files resolution 2026-02-05 13:31:46 -03:00
Catriel Müller 13e37b7cdf refactor: not push if there is conflicts 2026-02-05 13:31:46 -03:00
Catriel Müller 947b8a96f4 refactor: improve branch backup 2026-02-05 13:31:45 -03:00
Catriel Müller 033490587f refactor: improve premerge transforms 2026-02-05 13:31:16 -03:00
Catriel Müller 0960e6a85b refactor: improve upstream script 2026-02-05 13:31:16 -03:00
Catriel Müller 6352beb85e fix: use commit hash directly for conflict analysis instead of upstream/tag ref 2026-02-05 13:31:16 -03:00
Catriel Müller c543e4b13f refactor: improve README and i18n translations 2026-02-05 13:31:16 -03:00
Catriel Müller b79517acb8 feat: upstream script wip 2026-02-05 13:31:15 -03:00