chore: Merge main back into feature/12f branch
Metadata
Current evaluation
Closed unmerged as difficult to review; canonical/charmcraft#1547 superseded it with a single reviewable merge of main into feature/12f and was merged.
Resolution: closed superseded
Reason: Maintainers requested a new branch containing only the main-to-feature/12f merge. PR #1547 provided that focused replacement and was merged.
Evaluated by: mr-cal-bot
No scores available.
Issue body
Merge main branch into 12-factor branch to keep it updated
Evaluation history
| Date | Model | Scores | Action | Summary |
|---|---|---|---|---|
| stealth/space-bunny-alpha | — | closed superseded | Closed unmerged as difficult to review; canonical/charmcraft#1547 superseded it with a single reviewable merge of main into feature/12f and was merged. | |
| stealth/space-bunny-alpha | — | closed superseded | Unreviewable main-to-feature/12f merge PR (187 files, +10006/-2063) was closed unmerged at lengau's request; the work landed as a single squashed merge commit in #1547, which was merged. | |
| stealth/space-bunny-alpha | — | closed superseded | PR #1490 (merge main into feature/12f, +10006/-2063) was closed unmerged after review difficulty; maintainer lengau asked for a fresh single-merge PR, which landed as merged #1547. | |
| stealth/space-bunny-alpha | — | closed superseded | Closed unmerged by maintainer lengau as unreviewable (huge commit stack); superseded by merged PR #1547, which performed the main-to-feature/12f merge as a single reviewable commit. | |
| stealth/space-bunny-alpha | — | closed superseded | Closed unmerged and superseded by canonical/charmcraft#1547, which merged a reviewable main-to-feature/12f merge. | |
| qwen/qwen3.6-35b-a3b | — | — | 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. | |
| qwen3.6-35b-a3b-mtp-q6 | — | — | Closed without merging. Reviewers requested a cleaner PR with only the single merge commit to simplify review. The author was instructed to close this PR and open a new one, superseding this branch. |
Update history
No update history recorded yet.
Related work
-
Superseded By:
canonical/charmcraft#1547
(confidence 100%)
Merged a single main-to-feature/12f merge commit, replacing the oversized PR #1490.
-
Related To:
canonical/charmcraft#1545
(confidence 98%)
Merged separately before #1547, so maintainers said no additional merge for it was necessary.
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. | |
| #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. | |
| #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. | |
| #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. | |
| #1430 chore: merge 2.5.3 to main | charmcraft | closed | Closed unmerged and superseded by #1436, which merged Charmcraft 2.5.3 into main in commit 3c9e29b0. | |
| #4585 chore: merge main into feature/craft-application | snapcraft | merged | Merged main into feature/craft-application via PR #4585 after two approvals; the sync changed 17 files (+345/-93) with no unresolved review comments. | |
| #453 chore: merge origin/main | rockcraft | closed | Closed unmerged; PR canonical/rockcraft#468 later completed the main-into-feature/12f synchronization. | |
| #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. | |
| #494 chore: Merge main into Feature/12f | rockcraft | merged | Merged PR #494 synchronized feature/12f with main to keep the edge/12f channel open; the noted 24.04 spread failures were unrelated. | |
| #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). |