Skip to content

fix(patch): cherry-pick 8aace3a to release/v0.10.0-preview.2-pr-11549 [CONFLICTS]#11595

Merged
mattKorwel merged 2 commits into
release/v0.10.0-preview.2-pr-11549from
hotfix/v0.10.0-preview.2/0.10.0-preview.3/preview/cherry-pick-8aace3a/pr-11549
Oct 21, 2025
Merged

fix(patch): cherry-pick 8aace3a to release/v0.10.0-preview.2-pr-11549 [CONFLICTS]#11595
mattKorwel merged 2 commits into
release/v0.10.0-preview.2-pr-11549from
hotfix/v0.10.0-preview.2/0.10.0-preview.3/preview/cherry-pick-8aace3a/pr-11549

Conversation

@gemini-cli-robot

Copy link
Copy Markdown
Collaborator

This PR automatically cherry-picks commit 8aace3a to patch version v0.10.0-preview.2 in the preview release to create version 0.10.0-preview.3.

⚠️ Merge Conflicts Detected

This cherry-pick resulted in merge conflicts that need manual resolution.

🔧 Next Steps:

  1. Review the conflicts: Check out this branch and review the conflict markers
  2. Resolve conflicts: Edit the affected files to resolve the conflicts
  3. Test the changes: Ensure the patch works correctly after resolution
  4. Update this PR: Push your conflict resolution

📋 Files with conflicts:

The commit has been created with conflict markers for easier manual resolution.

🚨 Important:

  • Do not merge this PR until conflicts are resolved
  • The automated patch release will trigger once this PR is merged

# Conflicts:
#	packages/cli/src/config/config.test.ts
@gemini-cli-robot gemini-cli-robot requested a review from a team as a code owner October 21, 2025 17:42
@gemini-code-assist

Copy link
Copy Markdown
Contributor

Summary of Changes

Hello @gemini-cli-robot, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request represents an automated cherry-pick operation aimed at creating a new preview release, 0.10.0-preview.3. The core functional change introduced by the cherry-picked commit is to disable the experimental model routing feature by default within the CLI's configuration, impacting how models are selected. Due to discrepancies between the target branch and the cherry-picked commit, merge conflicts have arisen, necessitating manual resolution before this PR can be successfully merged. Additionally, various license and copyright details in the NOTICES.txt file have been updated.

Highlights

  • Automated Cherry-Pick: This pull request is an automated cherry-pick of commit '8aace3aff2720e73405eff715678fa4b68b4aea6' to create the preview release '0.10.0-preview.3'.
  • Model Routing Disabled by Default: The experimental model routing feature in the CLI configuration is now disabled by default.
  • License Information Updates: Various license and copyright details for several third-party dependencies have been updated in the NOTICES.txt file.
  • Merge Conflicts Detected: The automated cherry-pick process resulted in merge conflicts that require manual resolution before the PR can be merged.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

@gemini-code-assist gemini-code-assist Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request cherry-picks a change to disable the model router by default. The changes in config.ts and settingsSchema.ts correctly reflect this. However, there is a critical unresolved merge conflict in packages/cli/src/config/config.test.ts that is preventing the build from passing. This must be resolved before merging.

@github-actions

github-actions Bot commented Oct 21, 2025

Copy link
Copy Markdown

Size Change: 0 B

Total Size: 17.8 MB

ℹ️ View Unchanged
Filename Size
./bundle/gemini.js 17.8 MB
./bundle/sandbox-macos-permissive-closed.sb 1.03 kB
./bundle/sandbox-macos-permissive-open.sb 830 B
./bundle/sandbox-macos-permissive-proxied.sb 1.31 kB
./bundle/sandbox-macos-restrictive-closed.sb 3.29 kB
./bundle/sandbox-macos-restrictive-open.sb 3.36 kB
./bundle/sandbox-macos-restrictive-proxied.sb 3.56 kB

compressed-size-action

@mattKorwel mattKorwel enabled auto-merge (squash) October 21, 2025 18:04
@mattKorwel mattKorwel merged commit f35e241 into release/v0.10.0-preview.2-pr-11549 Oct 21, 2025
20 checks passed
@mattKorwel mattKorwel deleted the hotfix/v0.10.0-preview.2/0.10.0-preview.3/preview/cherry-pick-8aace3a/pr-11549 branch October 21, 2025 18:08
@sripasg sripasg added the size/m A medium sized PR label Jun 2, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size/m A medium sized PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants