chore(merge): 'starbase/main' into 'main'
Metadata
Current evaluation
Merged Starbase/main into rockcraft main via #843 (e4d7064a); follow-up commits starting at 001e1215 cleaned up conflict artifacts across GitHub config, docs, build files, tests, and dependencies.
Resolution: closed resolved
Reason: PR #843 was approved and merged as commit e4d7064a. Its merge intentionally carried conflict markers, with cleanup committed in a sequence beginning at 001e1215 and subsequent conflict-fix commits.
Evaluated by: mr-cal-bot
No scores available.
Issue body
This PR "properly" brings in Starbase as a regular merge. Since we'd done a "manual merge" a short while ago, the merge commit leaves in all conflicts (markers and all), which are then fixed in the next few commits.
Therefore, I think it's most useful to review this per-commit, starting at 001e1215475c88bc7f (`chore: fix conflicts in .github/`). Each commit addresses one broken bit, and most are reasonably small.
Evaluation history
| Date | Model | Scores | Action | Summary |
|---|---|---|---|---|
| stealth/space-bunny-alpha | — | closed resolved | Merged Starbase/main into rockcraft main via #843 (e4d7064a); follow-up commits starting at 001e1215 cleaned up conflict artifacts across GitHub config, docs, build files, tests, and dependencies. | |
| stealth/space-bunny-alpha | — | closed resolved | Merged starbase/main into main, with conflicts from an earlier manual merge resolved in follow-up commits starting at 001e1215. Approved by two reviewers; 63 files changed. | |
| qwen/qwen3.6-35b-a3b | — | — | Merged starbase/main into main, resolving conflicts from a prior manual merge via individual commits. Approved by two reviewers. Updated 63 files with 1507 additions and 970 deletions. | |
| qwen3.6-35b-a3b-mtp-q6 | — | — | Merged starbase/main into main to properly integrate changes and resolve conflict markers left by a prior manual merge. Commits systematically fix broken files, with review recommended per commit. |
Update history
No update history recorded yet.
Related issues
| Issue | Project | State | Summary | Similarity |
|---|---|---|---|---|
| #916 chore(merge): merge 'starbase/main' | rockcraft | merged | Merged starbase/main into Rockcraft main via canonical/rockcraft#916 (commit 4ea99312), with approval and all CI checks passing. | |
| #954 chore(merge): 'starbase/main' into 'main' | rockcraft | merged | Merged starbase/main into main via canonical/rockcraft#954; approved by two reviewers with all CI checks passing. | |
| #1040 chore(merge): 'starbase/main' into 'main' | rockcraft | merged | Merged starbase/main into main via commit 99d1c06a. The maintenance merge was redone after intervening changes and introduced no new commits or functional changes. | |
| #6391 chore(merge): merge/starbase into main | snapcraft | merged | Merged Starbase into main via #6391 (commit 12e00aa3a), bringing the latest branch changes for SNAPCRAFT-1361. | |
| #5419 chore(merge): merge starbase into main | snapcraft | merged | Merged the starbase branch into main via PR #5419 (commit e5752b8b3) for CRAFT-4322. It was an approved routine sync merge; the single failing Ubuntu24.04 spread test was acknowledged as a known 'craft test' issue. | |
| #1398 chore(merge): update starbase (2026-10-16) | rockcraft | merged | Merged PR #1398 syncing starbase/main into main, updating build system, workflows, docs tooling, and dependencies, with conflict resolutions and RTD build fixes. | |
| #865 chore(merge): starbase into main | rockcraft | merged | Merged starbase into main via PR #865 (commit 93f70f62); the reported pyright failure was confirmed to pre-exist on clean main. | |
| #453 chore: merge origin/main | rockcraft | closed | Closed unmerged; PR canonical/rockcraft#468 later completed the main-into-feature/12f synchronization. | |
| #213 chore(merge): update starbase (2026-10-19) | debcraft | merged | Merged starbase/main updates into debcraft/main, syncing docs tooling, workflows, pre-commit hooks, and templates. Resolved conflicts and passed all CI checks. | |
| #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. |