← Back to issue list

chore(merge): '1.20.3' into 'main'

View original Github issue

Metadata

Project
craft-providers
Number
#552
Type
pull request
State
merged
Author
mr-cal
Labels
—
Created
Updated
Closed

Current evaluation

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).

Resolution: closed superseded

Reason: #557 reverted #552 because its squash merge damaged the intended branch history. PR #558 subsequently merged 1.20.3 into main again as commit 620948b.

Evaluated by: mr-cal-bot

No scores available.

Issue body

- [x] Have you followed the guidelines for contributing? - [x] Have you signed the [CLA](http://www.ubuntu.com/legal/contributors/)? - [x] Have you successfully run `tox`? -----

Evaluation history

Date Model Scores Action Summary
stealth/space-bunny-alpha — closed superseded 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).
qwen/qwen3.6-35b-a3b — closed resolved Merged version 1.20.3 into main. Approved by 2 reviewers, passed CI. Author force-pushed twice due to other PRs landing on main first.

Update history

Date Change
created

Related work

  • Caused By: craft-providers#557 (confidence 100%)

    Merged a revert of #552 after it was incorrectly squash-merged.

  • Superseded By: craft-providers#558 (confidence 100%)

    Re-merged release 1.20.3 into main correctly as commit 620948b.

Related issues

Issue Project State Summary Similarity
#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.
94%
#557 chore(revert): revert "chore(merge): '1.20.3' into 'main' (#552)" craft-providers merged Merged as 0da3f0e, reverting the accidental squash merge eea1f62 (#552); #558 then merged version 1.20.3 into main correctly.
91%
#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.
90%
#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.
88%
#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.
87%
#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.
87%
#5026 chore(merge): 8.3.3 into main snapcraft merged Merged 8.3.3 into main via #5026 (da555e39e); only release notes were added because dependency updates were already present on main.
86%
#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.
86%
#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.
86%
#4979 chore(merge): 7.5.6 into 'main' snapcraft merged Merged release 7.5.6 into main via #4979, adding release notes and updating four files. Merge commit: 3e83dfddc.
86%