chore(merge): merge 'hotfix-1.1' into 'main'
Metadata
Current evaluation
Closed unmerged: #478 was an empty, mis-targeted hotfix merge. The follow-up #491 merged hotfix/1.2 back into main.
Resolution: closed superseded
Reason: Maintainers rejected #478 as empty and incorrectly targeted, asking for a main-based integration PR instead. Rockcraft#491 later merged hotfix/1.2 into main in commit bd69420e.
Evaluated by: mr-cal-bot
No scores available.
Issue body
- [ ] 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: #478 was an empty, mis-targeted hotfix merge. The follow-up #491 merged hotfix/1.2 back into main. | |
| stealth/space-bunny-alpha | — | closed stale | An empty merge PR integrating hotfix-1.1 into main was closed after maintainers identified the wrong branch target; no changes were merged. | |
| qwen/qwen3.6-35b-a3b | — | — | Merged into main after approval and passing CI. The pull request contained zero file changes, indicating a standard merge commit that successfully integrated the hotfix-1.1 branch. | |
| qwen3.6-35b-a3b-mtp-q6 | — | — | Closed without merging after a maintainer questioned the commit message and merge workflow. The hotfix branch was not integrated into main. |
Update history
No update history recorded yet.
Related work
-
Superseded By:
canonical/rockcraft#491
(confidence 94%)
The later successful hotfix-to-main merge replaced the abandoned merge workflow.
Related issues
| Issue | Project | State | Summary | Similarity |
|---|---|---|---|---|
| #491 chore(merge): merge 'hotfix/1.2' back to 'main' | rockcraft | merged | Merged hotfix/1.2 back into main via #491 (commit bd69420e), with two approvals. | |
| #511 chore(merge): merge 'hotfix/1.2' back into 'main' | rockcraft | merged | Merged hotfix/1.2 back into main via PR #511 (commit 0ef121f3), bringing the 1.2 maintenance fixes forward with two approvals. | |
| #500 chore(merge): merge 'hotfix/1.2' back into 'main' | rockcraft | merged | Merged PR #500 back-merged hotfix/1.2 into main after approval by two reviewers, with no unresolved comments. | |
| #470 chore(merge): merge 'hotfix/1.1' back to main | rockcraft | closed | Back-merge PR of hotfix/1.1 into main was approved by tigarmo but closed with an empty diff (0 files changed), leaving the 1.1 maintenance fixes integrated another way. | |
| #537 chore(merge): 'hotfix/1.20' into 'main' | craft-providers | merged | Merged hotfix/1.20 into main via commit 0b1d043 (#537), bringing the approved hotfix branch into the main line. | |
| #831 chore(merge): 'hotfix/5.6' into 'main' | craft-application | closed | Closed as superseded by #832, which merged hotfix/5.6 into main at commit 8c644216 after all CI checks passed. | |
| #630 chore(merge): 'hotfix/1.5' into 'main' | rockcraft | merged | Merged hotfix/1.5 into main via PR #630 at commit 1a5740ad after two approvals; 4 files changed (+13/-12). | |
| #563 chore(merge): 'hotfix/1.3' into 'main' | rockcraft | merged | Merged hotfix/1.3 into main in commit 5200e42, with no net file changes; the PR received two approvals. | |
| #848 chore(merge): 'merge-1.33.1' into 'main' | craft-parts | merged | Merged merge-1.33.1 into main via #848 (1302530c), bringing the 1.33.1 hotfix/release from #847 into the main branch. | |
| #558 chore: merge 'hotfix/1.3' back into 'main' | rockcraft | merged | Merged hotfix/1.3 back into main via PR #558, integrating the maintenance branch into the main line. |