← Back to issue list

many: merge starbase/main

View original Github issue

Metadata

Project
craft-archives
Number
#74
Type
pull request
State
merged
Author
tigarmo
Labels
Created
Updated
Closed

Current evaluation

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.

Suggested action:

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
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.
qwen3.6-35b-a3b-mtp-q6 Merged starbase/main into the repository. Conflicts were resolved using the starbase branch, followed by linting fixes. A regular merge was performed instead of a squash. Code coverage remained unchanged.

Update history

No update history recorded yet.

Related issues

Issue Project State Summary Similarity
#843 chore(merge): 'starbase/main' into 'main' rockcraft merged 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.
80%
#95 Merge starbase craft-archives closed Merged into main. Integrated the starbase branch with ruff formatting, disabled mandatory fixture() checks, and applied manual fixes across 25 files. Coverage improved by 0.51% with 80% diff coverage.
77%
#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.
77%
#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.
76%
#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.
76%
#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.
76%
#353 docs: clarify the steps for merging starbase into a project starbase merged Merged documentation update clarifying steps for merging starbase into a project. Approved by two reviewers, applying minimal changes (+2/-0 lines across one file).
76%
#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.
75%
#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.
75%
#3737 Main merge snapcraft merged Merged by maintainer sergiusens following single reviewer approval. Integrated a large update across 766 files, adding 25,034 lines and removing 12,856 lines into main.
75%