-
Notifications
You must be signed in to change notification settings - Fork 10.8k
fix(patch): cherry-pick 87a0db2 to release/v0.25.0-pr-17308 [CONFLICTS] #17316
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix(patch): cherry-pick 87a0db2 to release/v0.25.0-pr-17308 [CONFLICTS] #17316
Conversation
# Conflicts: # packages/cli/src/gemini.tsx
Summary of ChangesHello @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 is an automated cherry-pick aimed at integrating a critical fix into the Highlights
Using Gemini Code AssistThe 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
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 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
|
There was a problem hiding this comment.
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 attempts to cherry-pick a commit that modifies the authentication failure handling, deferring the application exit until after sandbox configuration. While the intent to prevent immediate crashes on initial authentication failure is a good improvement, the presence of merge conflict markers in packages/cli/src/gemini.tsx indicates that the cherry-pick was not clean. This requires manual resolution before the changes can be properly integrated and tested.
packages/cli/src/gemini.tsx
Outdated
| <<<<<<< HEAD | ||
| if ( | ||
| settings.merged.security?.auth?.selectedType && | ||
| !settings.merged.security?.auth?.useExternal | ||
| ) { | ||
| ======= | ||
| let initialAuthFailed = false; | ||
| if (!settings.merged.security.auth.useExternal) { | ||
| >>>>>>> 87a0db20d (fix(auth): don't crash when initial auth fails (#17308)) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
|
Size Change: +106 B (0%) Total Size: 23 MB ℹ️ View Unchanged
|
This PR automatically cherry-picks commit 87a0db2 to patch version v0.25.0 in the stable release to create version 0.25.1.
This cherry-pick resulted in merge conflicts that need manual resolution.
🔧 Next Steps:
📋 Files with conflicts:
The commit has been created with conflict markers for easier manual resolution.
🚨 Important: