chore: Merge main into Feature/12f
Metadata
Current evaluation
Merged main into feature/12f to keep the branch updated and the edge/12f channel open. The change was merged without formal reviews, with unrelated 24.04 package spread failures acknowledged by a reviewer.
Suggested action: —
No scores available.
Issue body
- [X] Have you signed the [CLA](http://www.ubuntu.com/legal/contributors/)?
-----
Merge main into feature/12f branch, to keep it up to date and ensure edge/12f channel stays open
Evaluation history
| Date | Model | Scores | Action | Summary |
|---|---|---|---|---|
| qwen/qwen3.6-35b-a3b | — | — | Merged main into feature/12f to keep the branch updated and the edge/12f channel open. The change was merged without formal reviews, with unrelated 24.04 package spread failures acknowledged by a reviewer. | |
| qwen3.6-35b-a3b-mtp-q6 | — | — | Merged main into the feature/12f branch to keep it current and maintain the edge/12f channel. CI spread failures were flagged as unrelated to this change. The request was successfully merged. | |
| qwen3.6-35b-a3b-mtp-q6 | — | — | Merged main into the feature/12f branch to maintain updates and keep the edge/12f channel open. Reported CI spread failures were attributed to unrelated 24.04 package changes. |
Update history
No update history recorded yet.
Related issues
| Issue | Project | State | Summary | Similarity |
|---|---|---|---|---|
| #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. | |
| #1595 chore: Merge main back to feature/12f | charmcraft | closed | Main branch was merged into feature/12f to keep it up-to-date. The pull request was closed. | |
| #1547 chore: merge main into feature/12f | charmcraft | merged | Merged main into feature/12f to keep the branch updated and maintain the snapstore channel. Approved by two reviewers following a corrected merge commit. macOS test timeouts were noted but did not block the merge. | |
| #468 chore: merge main into feature/12f | rockcraft | merged | Merged main into the feature/12f branch to keep it up to date. The contributor signed the CLA and completed the synchronization. | |
| #1490 chore: Merge main back into feature/12f branch | charmcraft | closed | Superseded. Reviewers requested a cleaner PR containing only the merge commit due to excessive history. Author instructed to close this and open a new PR with a single merge commit for streamlined review. | |
| #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. | |
| #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. | |
| #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. | |
| #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. | |
| #1558 chore: merge main into feature/ca-2 | charmcraft | closed | Closed as a routine merge. The PR integrated main into feature/ca-2, modifying 17 files with a net reduction of 507 lines. No reviews, comments, or CI checks were performed. |