chore: merge main into feature/12f
Metadata
Current evaluation
Merged PR #468 synchronized feature/12f with main; the author confirmed the branch update on 2024-02-12.
Resolution: closed resolved
Reason: PR #468 was merged, completing its branch-synchronization purpose. The author confirmed that main had been merged back into feature/12f to keep it current.
Evaluated by: mr-cal-bot
No scores available.
Issue body
- [X] Have you signed the [CLA](http://www.ubuntu.com/legal/contributors/)?
-----
Merge main back to 12-factor branch to keep it up to date
Evaluation history
| Date | Model | Scores | Action | Summary |
|---|---|---|---|---|
| stealth/space-bunny-alpha | — | closed resolved | Merged PR #468 synchronized feature/12f with main; the author confirmed the branch update on 2024-02-12. | |
| stealth/space-bunny-alpha | — | closed resolved | Merged PR #468 into feature/12f, synchronizing the 12-factor branch with main; the author confirmed the update on 2024-02-12. | |
| stealth/space-bunny-alpha | — | closed resolved | Merged canonical/rockcraft#468 brought main into feature/12f, synchronizing the 12-factor branch; the author confirmed the update on 2024-02-12. | |
| stealth/space-bunny-alpha | — | closed resolved | Merged #1547 into feature/12f to synchronize it with main, replacing earlier unmerged #1490. | |
| stealth/space-bunny-alpha | — | closed resolved | Merged main into feature/12f to keep the 12-factor branch current. The author confirmed the synchronization in a 2024-02-12 comment. | |
| stealth/space-bunny-alpha | — | closed resolved | Merged main into feature/12f to bring the 12-factor branch up to date; the contributor confirmed the sync on 2024-02-12. | |
| qwen/qwen3.6-35b-a3b | — | — | Merged main into the feature/12f branch to keep it up to date. The contributor signed the CLA and completed the synchronization. | |
| qwen3.6-35b-a3b-mtp-q6 | — | — | Merged main into the feature/12f branch to keep it synchronized with upstream changes. Completed by contributor gregory-schiano on February 12, 2024, following CLA verification. |
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 PR #503 after approval, synchronizing main into feature/12f with 183 additions and 21 deletions across 20 files. | |
| #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. | |
| #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). | |
| #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. | |
| #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. | |
| #1584 chore(merge): feature/ca-2 into main | charmcraft | closed | feature/ca-2 was merged into main via #1584, completing the branch integration and closing the pull request. | |
| #1172 chore(merge): main into feature/pro-sources | rockcraft | merged | Merged main into feature/pro-sources via PR #1172, bringing docs and workflow updates; the feature branch was later merged into main by PR #1184 (1987d98b). | |
| #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. |