chore(merge): 'starbase/main' into 'main'
Metadata
Current evaluation
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.
Suggested action: —
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 |
|---|---|---|---|---|
| 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. | |
| qwen3.6-35b-a3b-mtp-q6 | — | — | Merged starbase/main into main to resolve conflict markers left by a prior manual merge. Fixes were applied commit-by-commit to ensure clean integration and remove leftover markers. |
Update history
No update history recorded yet.
Related issues
| Issue | Project | State | Summary | Similarity |
|---|---|---|---|---|
| #954 chore(merge): 'starbase/main' into 'main' | rockcraft | merged | Merged starbase/main into main by maintainer tigarmo. Approved by two reviewers with all CI checks passing. The update modified 10 files, adding 210 and removing 201 lines. | |
| #916 chore(merge): merge 'starbase/main' | rockcraft | merged | Merged the 'starbase/main' branch following reviewer approval and successful CI checks. The update modified 11 files, adding 83 lines and removing 62. | |
| #252 chore(merge): starbase into main | craft-archives | merged | Merged starbase into main after approval from 2 reviewers and passing CI checks; 53 files changed with +2570/-1262 lines. | |
| #211 chore(merge): merge/starbase into main | craft-grammar | merged | Merged starbase into main after approval from two reviewers and passing all CI checks. The update modified 33 files, adding 719 lines and removing 837. | |
| #6391 chore(merge): merge/starbase into main | snapcraft | merged | Merged into main, incorporating the latest starbase changes. Approved by two reviewers and passing CI checks despite two failing integration tests, the update modified 72 files with 1481 additions and 1163 deletions. | |
| #865 chore(merge): starbase into main | rockcraft | merged | Merged starbase into main after three reviewers approved. CI passed, with unrelated lint warnings dismissed by the maintainer. The change added 248 lines and removed 147 across nine files. | |
| #5364 chore(merge): starbase into main | snapcraft | merged | Merged starbase into main ahead of the 8.8 release. Approved by three reviewers, passed CI checks, and updated eight files (+284/-63 lines). | |
| #5333 chore(merge): starbase into main | snapcraft | merged | Merged starbase into main to incorporate a new Jira configuration. Approved by two reviewers, passed CI checks, and updated four files. | |
| #141 chore(merge): starbase into main (#865) | imagecraft | merged | Merged starbase into main. Enables Tiobe TICS, modifying 11 files with 262 additions and 150 deletions. Approved by two reviewers and merged despite one failing CI check and two unresolved comments. | |
| #5668 chore(merge): starbase into main | snapcraft | merged | Merged starbase into main following approval from two reviewers. The change set was minor (+43/-37 lines across 3 files). A failing integration test was explicitly noted as unrelated by the maintainer prior to merge. Resolves SNAPCRAFT-1192. |