← Back to issue list

chore: Merge main back into feature/12f branch

View original Github issue

Metadata

Project
charmcraft
Number
#1490
Type
pull request
State
closed
Author
gregory-schiano
Labels
Created
Updated
Closed

Current evaluation

Superseded. Reviewers requested a cleaner PR containing only the merge commit due to excessive history. Author instructed to close this and open a new PR with a single merge commit for streamlined review.

Suggested action:

No scores available.

Issue body

Merge main branch into 12-factor branch to keep it updated

Evaluation history

Date Model Scores Action Summary
qwen/qwen3.6-35b-a3b Superseded. Reviewers requested a cleaner PR containing only the merge commit due to excessive history. Author instructed to close this and open a new PR with a single merge commit for streamlined review.
qwen3.6-35b-a3b-mtp-q6 Closed without merging. Reviewers requested a cleaner PR with only the single merge commit to simplify review. The author was instructed to close this PR and open a new one, superseding this branch.
qwen3.6-35b-a3b-mtp-q6 Closed without merging. Reviewers requested a new PR containing only the single merge commit to simplify review. The author agreed to create a fresh PR with just the merge, superseding this one.

Update history

No update history recorded yet.

Related issues

Issue Project State Summary Similarity
#1595 chore: Merge main back to feature/12f charmcraft closed Main branch was merged into feature/12f to keep it up-to-date. The pull request was closed.
87%
#503 chore(merge): merge 'main' back into 'feature/12f' rockcraft merged Merged main into feature/12f to synchronize branches. Approved by one reviewer, passed CI checks, and successfully merged by external contributor gregory-schiano.
85%
#494 chore: Merge main into Feature/12f rockcraft merged Merged main into feature/12f to keep the branch updated and the edge/12f channel open. The change was merged without formal reviews, with unrelated 24.04 package spread failures acknowledged by a reviewer.
82%
#468 chore: merge main into feature/12f rockcraft merged Merged main into the feature/12f branch to keep it up to date. The contributor signed the CLA and completed the synchronization.
81%
#1547 chore: merge main into feature/12f charmcraft merged Merged main into feature/12f to keep the branch updated and maintain the snapstore channel. Approved by two reviewers following a corrected merge commit. macOS test timeouts were noted but did not block the merge.
81%
#4579 chore(merge): 'main' into 'feature/components' snapcraft closed Merged main into feature/components to resolve issue #4576. The pull request was closed following the integration.
79%
#1558 chore: merge main into feature/ca-2 charmcraft closed Closed as a routine merge. The PR integrated main into feature/ca-2, modifying 17 files with a net reduction of 507 lines. No reviews, comments, or CI checks were performed.
79%
#412 chore: merge origin/main rockcraft merged Merged origin/main into feature/12f. Resolved conflicts and applied manual updates to align with upstream refactorings and updated base notation. Approved by three reviewers and passed CI checks.
79%
#1159 chore(merge): main into feature/pro-sources rockcraft merged Merged main into feature/pro-sources. The merge intentionally leaves the build broken due to stale dependency references, which a follow-up PR will resolve. Approved by two reviewers.
78%
#1480 chore: merge origin/main charmcraft closed Closed as superseded by pull request #1547. Initially flagged as a duplicate of #1490, the pull request was closed without review or CI checks.
78%