chore(merge): rebase on origin/main
Metadata
Current evaluation
Merged after rebasing feature/craft-application onto origin/main. Approved by two reviewers, title corrected, and tests passed. Completes the first step of the planned branch integration sequence.
Suggested action: —
No scores available.
Issue body
No description provided.
Evaluation history
| Date | Model | Scores | Action | Summary |
|---|---|---|---|---|
| qwen/qwen3.6-35b-a3b | — | — | Merged after rebasing feature/craft-application onto origin/main. Approved by two reviewers, title corrected, and tests passed. Completes the first step of the planned branch integration sequence. | |
| qwen3.6-35b-a3b-mtp-q6 | — | — | Merged after title correction per reviewer feedback. Acts as the initial step to integrate origin/main into the feature/craft-application branch, with a follow-up merge planned. Codecov coverage verified. | |
| qwen3.6-35b-a3b-mtp-q6 | — | — | Merged after rebasing feature/craft-application onto origin/main. Title was corrected per reviewer feedback and confirmed as the first step in a planned merge strategy. Codecov checks passed. |
Update history
No update history recorded yet.
Related issues
| Issue | Project | State | Summary | Similarity |
|---|---|---|---|---|
| #412 chore: merge origin/main | rockcraft | merged | Merged origin/main into feature/12f. Resolved conflicts and applied manual updates to align with upstream refactorings and updated base notation. Approved by three reviewers and passed CI checks. | |
| #1050 chore(merge): feature/pro-sources into main | craft-application | merged | Merged feature/pro-sources into main, resolving CRAFT-5016. Approved by two reviewers and passed CI checks. Adds 1554 lines across 19 files. | |
| #503 chore(merge): merge 'main' back into 'feature/12f' | rockcraft | merged | Merged main into feature/12f to synchronize branches. Approved by one reviewer, passed CI checks, and successfully merged by external contributor gregory-schiano. | |
| #1172 chore(merge): main into feature/pro-sources | rockcraft | merged | Merged main into feature/pro-sources after resolving conflicts and integrating documentation and workflow fixes. Approved by two reviewers and passed CI checks. | |
| #4777 chore(merge): '8.2.2' into 'main' | snapcraft | merged | Merged version 8.2.2 into main after approval from two reviewers. Unrelated test failures were addressed separately. The branch was successfully integrated. | |
| #798 chore: merge main into 2.0 feature branch | craft-parts | merged | Merged to resolve CI failures by integrating main into the 2.0 feature branch. Approved by two reviewers with passing checks. The maintainer synchronized the branches to restore continuous integration. | |
| #1031 chore(merge): main into feature/pro-sources | craft-application | merged | Merged main into the stale feature/pro-sources branch via a manual merge due to prior squash merges and outdated base. CI failures were expected and accepted. Approved and merged to enable upcoming cleanup and final integration. | |
| #1475 chore(merge): main into feature/pro-sources | craft-parts | merged | Merged main into feature/pro-sources following two approvals. The maintainer anticipated CI failures and scheduled a separate cleanup PR. The branch was merged as a preparatory step despite failing edge-case tests. | |
| #4581 chore(merge): 'main' into 'feature/components' | snapcraft | merged | Merged main into feature/components, resolving #4576. Approved by a reviewer, passed CI, and maintained full test coverage across 91 files. | |
| #336 chore(merge): '2.6.3' into 'main' | craft-application | merged | Merged version 2.6.3 into the main branch. The pull request passed CI checks, received approval from two reviewers, and updated four files with 109 additions and 41 deletions. |