chore: Merge main into Feature/12f
Metadata
Current evaluation
Merged PR #494 synchronized feature/12f with main to keep the edge/12f channel open; the noted 24.04 spread failures were unrelated.
Resolution: closed resolved
Reason: PR #494 was merged into feature/12f. The merge updated the branch with main, and maintainer @tigarmo clarified that the observed spread failures were unrelated to this maintenance change.
Evaluated by: mr-cal-bot
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 |
|---|---|---|---|---|
| stealth/space-bunny-alpha | — | closed resolved | Merged PR #494 synchronized feature/12f with main to keep the edge/12f channel open; the noted 24.04 spread failures were unrelated. | |
| stealth/space-bunny-alpha | — | closed resolved | Merged canonical/rockcraft#494 to sync feature/12f with main and keep edge/12f open; reviewer tigarmo said the 24.04 spread failures were unrelated. | |
| 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. |
Update history
No update history recorded yet.
Related issues
| Issue | Project | State | Summary | Similarity |
|---|---|---|---|---|
| #468 chore: merge main into feature/12f | rockcraft | merged | Merged PR #468 synchronized feature/12f with main; the author confirmed the branch update on 2024-02-12. | |
| #503 chore(merge): merge 'main' back into 'feature/12f' | rockcraft | merged | Merged PR #503 after approval, synchronizing main into feature/12f with 183 additions and 21 deletions across 20 files. | |
| #1547 chore: merge main into feature/12f | charmcraft | merged | Merged main into feature/12f as a single merge commit (+9828/-2082) to refresh the branch and keep the snapstore channel open; approved by 2 reviewers. macOS extension test timeouts were flagged but deemed non-blocking. | |
| #1490 chore: Merge main back into feature/12f branch | charmcraft | closed | Closed unmerged as difficult to review; canonical/charmcraft#1547 superseded it with a single reviewable merge of main into feature/12f and was merged. | |
| #614 chore: merge branch 'main' into 'feature/2.0' | craft-providers | merged | Merged main into feature/2.0 as a branch-sync update in commit 87435d0 after maintainer approval. | |
| #913 chore(merge): main into feature/pro-sources | craft-providers | merged | Merged main into the long-lived feature/pro-sources branch (commit f7edf3d) after a complex conflict caused by squashed PR #721; lint/test CI failures were accepted and deferred. The branch later landed in main via #918 (b56ff14). | |
| #1159 chore(merge): main into feature/pro-sources | rockcraft | merged | Merged main into feature/pro-sources; follow-up #1184 then squash-merged the feature into main as 1987d98b, completing the integration. | |
| #1595 chore: Merge main back to feature/12f | charmcraft | closed | Closed unmerged after reviewers rejected the PR's excessive history and requested a replacement containing only the merge commit; no resolving commit was recorded. | |
| #4579 chore(merge): 'main' into 'feature/components' | snapcraft | closed | PR #4579 merged main into feature/components, bringing the core24 provider fix into the components build; components snap revision 10646 was verified for #4576. | |
| #1475 chore(merge): main into feature/pro-sources | craft-parts | merged | Merged main into feature/pro-sources to synchronize the branch; expected CI failures were deferred, while the pro-sources feature later landed in #1483 (bedb4c0f). |