chore(merge): merge 'main' back into 'feature/12f'
Metadata
Current evaluation
Merged PR #503 after approval, synchronizing main into feature/12f with 183 additions and 21 deletions across 20 files.
Resolution: closed resolved
Reason: PR #503 was approved and merged into feature/12f, completing the requested synchronization. The related Flask extension feature was delivered by PR #499 in commit a6d85d06.
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 into `feature/12f` branch to keep it up-to-date
Evaluation history
| Date | Model | Scores | Action | Summary |
|---|---|---|---|---|
| stealth/space-bunny-alpha | — | closed resolved | Merged PR #503 after approval, synchronizing main into feature/12f with 183 additions and 21 deletions across 20 files. | |
| stealth/space-bunny-alpha | — | closed resolved | Merged canonical/rockcraft#503 to synchronize main into feature/12f, updating 20 files with 183 additions and 21 deletions after approval. | |
| qwen/qwen3.6-35b-a3b | — | — | Merged main into feature/12f to synchronize branches. Approved by one reviewer, passed CI checks, and successfully merged by external contributor gregory-schiano. | |
| qwen3.6-35b-a3b-mtp-q6 | — | — | Merged main into the feature/12f branch to synchronize it with the latest upstream changes. The request was successfully merged without comments or conflicts. |
Update history
No update history recorded yet.
Related work
-
Related To:
canonical/rockcraft#499
(confidence 90%)
The synchronized feature/12f branch developed the Flask framework extension merged by #499.
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. | |
| #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). | |
| #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. | |
| #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. | |
| #4581 chore(merge): 'main' into 'feature/components' | snapcraft | merged | Merged PR #4581 brought main into feature/components, updating the components snap with core24 support in revision 10646 and fixing #4576. | |
| #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). | |
| #918 chore(merge): feature/pro-sources into main | craft-providers | merged | Merged feature/pro-sources into main via #918 (commit b56ff14), completing CRAFT-5012 with all CI checks passing and 1,594 additions across 9 files. | |
| #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. | |
| #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. | |
| #1184 chore(merge): feature/pro-sources into main | rockcraft | merged | Squash-merged feature/pro-sources into main as commit 1987d98b, changing 36 files; all reported CI checks passed and the PR received two approvals. |