chore(revert): revert "chore(merge): '1.20.3' into 'main' (#552)"
Metadata
Current evaluation
Merged as 0da3f0e, reverting the accidental squash merge eea1f62 (#552); #558 then merged version 1.20.3 into main correctly.
Resolution: closed resolved
Reason: PR #557 was merged as commit 0da3f0e, reverting the mistaken squash merge from #552. Follow-up PR #558 subsequently merged the 1.20.3 release properly.
Evaluated by: mr-cal-bot
No scores available.
Issue body
This reverts commit eea1f6237bd85a83ca6ce8e2db20dc6d3c5733bb.
I messed up and squash-merged instead of doing a real merge
- [ ] Have you followed the guidelines for contributing?
- [ ] Have you signed the [CLA](http://www.ubuntu.com/legal/contributors/)?
- [ ] Have you successfully run `tox`?
-----
Evaluation history
| Date | Model | Scores | Action | Summary |
|---|---|---|---|---|
| stealth/space-bunny-alpha | — | closed resolved | Merged as 0da3f0e, reverting the accidental squash merge eea1f62 (#552); #558 then merged version 1.20.3 into main correctly. | |
| qwen/qwen3.6-35b-a3b | — | closed resolved | Merged to revert an incorrectly squash-merged commit of '1.20.3' into 'main', restoring proper branch history. |
Update history
| Date | Change |
|---|---|
| created |
Related work
-
Caused By:
craft-providers#552
(confidence 100%)
Its accidental squash merge was reverted by this PR.
-
Related To:
craft-providers#558
(confidence 98%)
This follow-up PR correctly merged version 1.20.3 into main after the revert.
Related issues
| Issue | Project | State | Summary | Similarity |
|---|---|---|---|---|
| #552 chore(merge): '1.20.3' into 'main' | craft-providers | merged | Merged 1.20.3 into main, but the incorrect squash merge was reverted by #557; the release was then correctly merged again through #558 (commit 620948b). | |
| #558 chore(merge): '1.20.3' into 'main' | craft-providers | merged | Merged release 1.20.3 into main via PR #558 (commit 620948b), restoring it after the earlier #552 merge was reverted by #557. | |
| #953 chore(merge): 1.25.3 into main | craft-parts | merged | Merged release branch 1.25.3 into main in 857152c8; only a nine-line changelog entry remained because dependency updates and CI fixes were already in main or irrelevant. | |
| #1268 chore(merge): 1.19.1 into main | rockcraft | merged | Merged release branch 1.19.1 into main via #1268 (commit 5ea7a39e), including release notes added by #1265. | |
| #642 chore(merge): 1.24.2 into main | craft-providers | merged | Merged release 1.24.2 into main via PR #642 at commit cf9fb1f, after approval from two reviewers. | |
| #907 chore(merge): 2.1.3 into main | craft-parts | merged | Merged release 2.1.3 into main via #907 at commit 37dd40cb, including the version bump prepared in #906. | |
| #1223 chore(merge): 2.20.1 into main | craft-parts | merged | Merged the 2.20.1 release branch into main via PR #1223 (commit 30ea3701); all reported CI checks passed. | |
| #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. | |
| #769 chore: merge 1.33 from main to 2.0 feature branch | craft-parts | merged | Merged 1.33 from main into the 2.0 feature branch in 251a88c5; follow-up #798 re-merged main in d866f133 to fix remaining test failures. | |
| #376 chore(merge): merge '2.9.0' into 'main' | craft-application | merged | Merged release branch 2.9.0 into main in commit 25b56649, incorporating late PR #373 and redoing the staged merge. |