[EXPERIMENTAL] merge starbase/main
Metadata
Current evaluation
Closed unmerged as an experiment; PR #74 superseded it by performing the real starbase/main merge with conflicts resolved and lint fixes.
Resolution: closed superseded
Reason: The maintainer explicitly closed #70 to do the merge "for real." PR #74 subsequently merged starbase/main into main after resolving conflicts and fixing lint issues.
Evaluated by: mr-cal-bot
No scores available.
Issue body
This is a little experiment into the workflow of updating craft-archives with starbase's changes. Here's what I did:
* Added canonical/starbase as a remote in my local craft-archives repo (remote called `starbase`);
* Created this `merge-starbase` branch;
* Merged `starbase/main` into the branch with `git merge starbase/main --allow-unrelated-histories`;
* Commited the merge, conflicts and all.
I left the conflicts in so we can see them on the diff. From the looks of it I think most conflicts are easy to solve (for many we can just keep craft-archives' version) and they show clearly the updates in starbase that are worth bringing in.
Comments??
Evaluation history
| Date | Model | Scores | Action | Summary |
|---|---|---|---|---|
| stealth/space-bunny-alpha | — | closed superseded | Closed unmerged as an experiment; PR #74 superseded it by performing the real starbase/main merge with conflicts resolved and lint fixes. | |
| stealth/space-bunny-alpha | — | closed superseded | Experimental starbase import was closed unmerged; successor PR #74 later merged starbase/main into craft-archives, resolved conflicts, and added lint fixes. | |
| stealth/space-bunny-alpha | — | closed superseded | Experimental starbase/main merge #70 was closed unmerged; the real integration was completed in merged PR #163 at commit 0872a9c. | |
| qwen/qwen3.6-35b-a3b | — | — | Closed as an experiment to demonstrate merging starbase/main into craft-archives. Conflicts were intentionally preserved to highlight updates. The author closed the pull request to execute the merge properly in a follow-up process. |
Update history
No update history recorded yet.
Related work
-
Superseded By:
canonical/craft-archives#74
(confidence 100%)
The approved follow-up PR performed the intended merge and was merged into main.
Related issues
| Issue | Project | State | Summary | Similarity |
|---|---|---|---|---|
| #74 many: merge starbase/main | craft-archives | merged | Merged starbase/main via commit 071d217, resolving conflicts in favor of starbase; follow-up lint fixes produced merged PR head b23d3b3. | |
| #95 Merge starbase | craft-archives | closed | Merged Starbase into main via PR #95, including Ruff formatting, relaxed fixture() enforcement, and manual 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. | |
| #353 Starbase merge | craft-providers | closed | Starbase merge PR #353 (merge commit 435181e) was closed unmerged by author mr-cal, since merge commits rebase poorly ahead of a starbase freeze; the work was redone later. | |
| #30 chore: merge starbase | craft-grammar | closed | Closed unmerged; the starbase integration landed on main via commit 3a6f6c4 (chore(merge): 'starbase' into 'main'). | |
| #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. | |
| #177 chore(merge): update starbase (2026-07-22) | debcraft | closed | Starbase merge PR #177 was closed unmerged because OSV-scanner failed; the maintainer confirmed main had the same issue and deferred a fresh merge PR. | |
| #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. | |
| #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). | |
| #510 test: don't merge this | starbase | closed | PR #510 "test: don't merge this" by cmatsuoka added a trivial +2-line change and was deliberately left unmerged and closed; no resolving commit exists in starbase history. |