many: merge starbase/main
Metadata
Current evaluation
Merged starbase/main via commit 071d217, resolving conflicts in favor of starbase; follow-up lint fixes produced merged PR head b23d3b3.
Resolution: closed resolved
Reason: PR #74 was approved and intentionally merged with a regular merge rather than squashed. It brought starbase/main into the project and resolved conflicts using the starbase versions.
Evaluated by: mr-cal-bot
No scores available.
Issue body
The commit list is huge because this is bringing in the entirety of starbase/main; I think the important commits to look at are the last merge, done by me (most conflicts were solved by using the starbase version), and the handful of commits after that fixing linting issues.
Evaluation history
| Date | Model | Scores | Action | Summary |
|---|---|---|---|---|
| stealth/space-bunny-alpha | — | closed resolved | Merged starbase/main via commit 071d217, resolving conflicts in favor of starbase; follow-up lint fixes produced merged PR head b23d3b3. | |
| stealth/space-bunny-alpha | — | closed resolved | Merged starbase/main into main via PR #74, preserving merge history; conflicts favored starbase and follow-up lint fixes were included in merge commit 071d217. | |
| stealth/space-bunny-alpha | — | closed resolved | Merged starbase/main into main, resolving conflicts in favor of starbase and fixing lint issues. The approved PR was intentionally merged normally to preserve history. | |
| stealth/space-bunny-alpha | — | closed resolved | Merged starbase/main into craft-archives, resolving conflicts and adding lint fixes; approved and coverage remained unchanged. | |
| stealth/space-bunny-alpha | — | closed resolved | Merged PR #74, importing all of starbase/main into main, resolving conflicts and fixing lint issues. Coverage remained unchanged. | |
| qwen/qwen3.6-35b-a3b | — | — | Merged starbase/main into main after resolving conflicts and fixing linting issues. Approved by one reviewer with no coverage change. Maintainer specified a regular merge to preserve history. |
Update history
No update history recorded yet.
Related issues
| Issue | Project | State | Summary | Similarity |
|---|---|---|---|---|
| #70 [EXPERIMENTAL] merge starbase/main | craft-archives | closed | Closed unmerged as an experiment; PR #74 superseded it by performing the real starbase/main merge with conflicts resolved and lint fixes. | |
| #324 starbase: merge 'starbase/main' | craft-providers | merged | Merged starbase/main into craft-providers without squashing. PR #324 landed via merge commit 7aacbfd (PR tip f06bf01), changing 9 files. | |
| #95 Merge starbase | craft-archives | closed | Merged Starbase into main via PR #95, including Ruff formatting, relaxed fixture() enforcement, and manual fixes. | |
| #211 chore(merge): merge/starbase into main | craft-grammar | merged | Merged starbase into main via #211 (commit b95cc0d), changing 33 files (+719/-837); all CI checks passed and two reviewers approved. | |
| #1019 chore(merge): update starbase (2026-10-09) | craft-providers | closed | Merged into main, updating starbase to a310931. Includes build tooling, CI workflow, and dependency updates. Conflict resolutions applied and validation passed. | |
| #30 chore: merge starbase | craft-grammar | closed | Closed unmerged; the starbase integration landed on main via commit 3a6f6c4 (chore(merge): 'starbase' into 'main'). | |
| #252 chore(merge): starbase into main | craft-archives | merged | Merged Starbase into main via PR #252 after two approvals; all CI checks passed, with 53 files changed (+2570/-1262). | |
| #449 chore(merge): update starbase (2026-09-28) | imagecraft | merged | Merged in #449 via commit 545f51a, rebuilding the Starbase sync on current main and starbase/main and folding dependency, lint, docs, and CI adjustments into one merge. | |
| #145 Merge starbase/main | craft-cli | merged | Merged Starbase into craft-cli: build config moved to pyproject.toml (setup.py/cfg and Makefiles removed), linters, coverage and docs updated. Landed as PR #145, approved and merged. | |
| #507 chore(merge): update starbase (2026-10-20) | craft-cli | merged | Merged starbase/main sync updating CI workflows, build tooling, and docs scaffolding. Resolved 27 file conflicts, incorporated prep PRs #505 and #506, and squashed follow-up fixes into a single merge commit. |