← Back to issue list

chore: merge main into feature/12f

View original Github issue

Metadata

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

Current evaluation

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.

Suggested action:

No scores available.

Issue body

Merge main back into feature/12f to keep the branch up to date and ensure snapstore channel stays open

Evaluation history

Date Model Scores Action Summary
qwen/qwen3.6-35b-a3b 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.
qwen3.6-35b-a3b-mtp-q6 Merged to synchronize the feature/12f branch with main and maintain the snapstore channel. Approved despite macOS test timeouts after restructuring commits and applying minor fixes.
qwen3.6-35b-a3b-mtp-q6 Merged main into feature/12f to keep the branch updated and maintain snapstore channel access. Approved despite macOS test timeouts marked non-blocking. Contributor updated to a single merge commit before final merge.

Update history

No update history recorded yet.

Related issues

Issue Project State Summary Similarity
#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.
86%
#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.
84%
#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.
84%
#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.
83%
#5393 chore(merge): feature/snapcraft-test into main snapcraft merged Merged feature/snapcraft-test into main after two reviewer approvals. The change updated 54 files and passed most CI checks, with failing spread tests acknowledged for later resolution on main.
81%
#1490 chore: Merge main back into feature/12f branch charmcraft closed 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.
81%
#4581 chore(merge): 'main' into 'feature/components' snapcraft merged Merged main into feature/components, resolving #4576. Approved by a reviewer, passed CI, and maintained full test coverage across 91 files.
80%
#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.
80%
#1475 chore(merge): main into feature/pro-sources craft-parts merged Merged main into feature/pro-sources following two approvals. The maintainer anticipated CI failures and scheduled a separate cleanup PR. The branch was merged as a preparatory step despite failing edge-case tests.
80%
#1031 chore(merge): main into feature/pro-sources craft-application merged Merged main into the stale feature/pro-sources branch via a manual merge due to prior squash merges and outdated base. CI failures were expected and accepted. Approved and merged to enable upcoming cleanup and final integration.
79%