chore: merge origin/main
Metadata
Current evaluation
Closed unmerged; PR canonical/rockcraft#468 later completed the main-into-feature/12f synchronization.
Resolution: closed superseded
Reason: PR #453 was closed without receiving review or CI feedback. PR #468 subsequently synchronized main with feature/12f and was merged, providing the effective branch update.
Evaluated by: mr-cal-bot
No scores available.
Issue body
- [x] Have you signed the [CLA](http://www.ubuntu.com/legal/contributors/)?
-----
Evaluation history
| Date | Model | Scores | Action | Summary |
|---|---|---|---|---|
| stealth/space-bunny-alpha | — | closed superseded | Closed unmerged; PR canonical/rockcraft#468 later completed the main-into-feature/12f synchronization. | |
| stealth/space-bunny-alpha | — | closed superseded | Closed unmerged; #468 later merged the main-branch synchronization into feature/12f, superseding the abandoned sync PR. | |
| stealth/space-bunny-alpha | — | closed superseded | Closed unmerged; #1547 superseded this branch synchronization by successfully merging main into feature/12f. | |
| qwen/qwen3.6-35b-a3b | — | — | Closed without merging. The maintainer-initiated synchronization PR received no reviews or CI checks and was abandoned, likely superseded by a newer branch update. | |
| qwen3.6-35b-a3b-mtp-q6 | — | — | Merged as a routine branch synchronization to align with origin/main. Closed after maintainer submission and CLA verification, with no additional changes or discussion required. |
Update history
No update history recorded yet.
Related work
-
Superseded By:
canonical/rockcraft#468
(confidence 82%)
Later PR #468 completed the same main-into-feature/12f synchronization and was merged.
Related issues
| Issue | Project | State | Summary | Similarity |
|---|---|---|---|---|
| #1480 chore: merge origin/main | charmcraft | closed | Closed unmerged 2024-02-29 by lengau as superseded by charmcraft#1547, which merged main into feature/12f as a single reviewable merge commit. jdkandersson had earlier flagged #1480 as a duplicate of #1490. | |
| #916 chore(merge): merge 'starbase/main' | rockcraft | merged | Merged starbase/main into Rockcraft main via canonical/rockcraft#916 (commit 4ea99312), with approval and all CI checks passing. | |
| #954 chore(merge): 'starbase/main' into 'main' | rockcraft | merged | Merged starbase/main into main via canonical/rockcraft#954; approved by two reviewers with all CI checks passing. | |
| #843 chore(merge): 'starbase/main' into 'main' | rockcraft | merged | Merged Starbase/main into rockcraft main via #843 (e4d7064a); follow-up commits starting at 001e1215 cleaned up conflict artifacts across GitHub config, docs, build files, tests, and dependencies. | |
| #1211 chore: merge 2.20.1 to main | craft-parts | closed | PR #1211 was closed unmerged as redundant; canonical/craft-parts#1223 merged version 2.20.1 into main via commit 30ea3701. | |
| #4549 chore(merge): rebase on origin/main | snapcraft | merged | Merged PR #4549 into feature/craft-application, syncing it with origin/main as the first branch-integration step; the feature was later merged into main by #4560. | |
| #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. | |
| #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. | |
| #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. |