[EXPERIMENTAL] merge starbase/main
Metadata
Current evaluation
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.
Suggested action: —
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 |
|---|---|---|---|---|
| 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. | |
| qwen3.6-35b-a3b-mtp-q6 | — | — | Abandoned as an experimental workflow test. The author intentionally left merge conflicts for review but closed the pull request to perform the actual merge properly instead. |
Update history
No update history recorded yet.
Related issues
| Issue | Project | State | Summary | Similarity |
|---|---|---|---|---|
| #74 many: merge starbase/main | craft-archives | merged | 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. | |
| #145 Merge starbase/main | craft-cli | merged | Merged starbase/main into craft-cli, migrating build config to pyproject.toml, updating linters and docs, and removing legacy files. Branch protection disabled. Approved after conflict resolution and CI adjustments. |