← Back to issue list

chore(merge): main into feature/override_overlay

View original Github issue

Metadata

Project
craft-parts
Number
#1459
Type
pull request
State
merged
Author
smethnani
Labels
—
Created
Updated
Closed

Current evaluation

Merged PR #1459 (smethnani) synced main into feature/override_overlay, 2 approvals and all CI green; the feature it updates landed via #1472 (43dc8484) plus docs #1473 (1b2b7d5a), released in 2.30.0.

Resolution: closed resolved

Reason: The PR was itself merged into the feature/override_overlay branch after 2 approvals with all CI checks passing. The branch work was subsequently completed by PR #1472 (feat: add override-overlay, commit 43dc8484) and documented in PR #1473 (1b2b7d5a), shipped in 2.30.0.

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 `make lint && make test`? - [x] Have you added an entry to the changelog (`docs/reference/changelog.rst`)? --- update feature branch

Evaluation history

Date Model Scores Action Summary
stealth/space-bunny-alpha — closed resolved Merged PR #1459 (smethnani) synced main into feature/override_overlay, 2 approvals and all CI green; the feature it updates landed via #1472 (43dc8484) plus docs #1473 (1b2b7d5a), released in 2.30.0.
stealth/space-bunny-alpha — closed resolved Merged PR #1459 updated feature/override_overlay with main (+2,528/-207 across 72 files), with two approvals and all CI checks passing.
stealth/space-bunny-alpha — closed resolved Merged #1459, updating feature/override_overlay from main after two approvals and with all CI checks passing (72 files, +2528/-207).
qwen/qwen3.6-35b-a3b — — Merged main into feature/override_overlay after two approvals and passing all CI checks. The update added 2528 lines and removed 207 across 72 files, synchronizing the feature branch with main.
qwen3.6-35b-a3b-mtp-q6 — — Merged main into feature/override_overlay to synchronize updates. Successfully merged by maintainer smethnani without additional comments.

Update history

No update history recorded yet.

Related work

  • Related To: canonical/craft-parts#1472 (confidence 90%)

    Final feature PR on the override_overlay branch that this merge kept up to date with main; merged as 43dc8484.

  • Related To: canonical/craft-parts#1473 (confidence 80%)

    Documentation/changelog follow-up for the override-overlay feature (1b2b7d5a).

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.
83%
#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).
82%
#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.
82%
#5569 chore(merge): feature/dotnet into main snapcraft merged Merged feature/dotnet into main in commit 6f88f58db (#5569) after approval and required CI checks passed; prerequisite #5570 had merged.
81%
#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.
81%
#1040 chore(merge): 2.4.3 into main craft-parts merged Merged version 2.4.3 into main via PR #1040, landing as commit fab7fa92 after two reviewer approvals.
80%
#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).
80%
#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.
79%
#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.
79%
#798 chore: merge main into 2.0 feature branch craft-parts merged Merged main into the feature/2.0 branch via commit d866f133 (branch work/main-to-2.0) to clear CI failures. Approved by 2 reviewers; 40 files changed, +203/-125. Merge-only chore PR.
79%