fix(patch): cherry-pick 06fcdc2 to release/v0.37.0-pr-24839 [CONFLICTS]#25051
Conversation
# Conflicts: # packages/cli/src/acp/commandHandler.test.ts # packages/cli/src/acp/commandHandler.ts
Summary of ChangesHello, 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 aims to backport 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. Footnotes
|
There was a problem hiding this comment.
Code Review
This pull request introduces the /help and /about commands to the Gemini CLI, including the implementation of the HelpCommand and its associated tests. The HelpCommand provides users with a sorted list of available commands and basic context instructions. However, critical issues were identified as several files contain unresolved merge conflict markers, which will prevent the project from building.
| <<<<<<< HEAD | ||
| ======= | ||
|
|
||
| const about = parse('/about'); | ||
| expect(about.commandToExecute?.name).toBe('about'); | ||
|
|
||
| const help = parse('/help'); | ||
| expect(help.commandToExecute?.name).toBe('help'); | ||
| >>>>>>> 06fcdc231 (feat(acp): add /help command (#24839)) |
There was a problem hiding this comment.
This file contains unresolved merge conflict markers. This will cause the build to fail. Please resolve the conflicts before merging.
const about = parse('/about');
expect(about.commandToExecute?.name).toBe('about');
const help = parse('/help');
expect(help.commandToExecute?.name).toBe('help');| <<<<<<< HEAD | ||
| ======= | ||
| import { AboutCommand } from './commands/about.js'; | ||
| import { HelpCommand } from './commands/help.js'; | ||
| >>>>>>> 06fcdc231 (feat(acp): add /help command (#24839)) |
There was a problem hiding this comment.
This file contains unresolved merge conflict markers. This will cause the build to fail. Please resolve the conflicts before merging.
import { AboutCommand } from './commands/about.js';
import { HelpCommand } from './commands/help.js';| <<<<<<< HEAD | ||
| ======= | ||
| registry.register(new AboutCommand()); | ||
| registry.register(new HelpCommand(registry)); | ||
| >>>>>>> 06fcdc231 (feat(acp): add /help command (#24839)) |
There was a problem hiding this comment.
This file contains unresolved merge conflict markers. This will cause the build to fail. Please resolve the conflicts before merging.
registry.register(new AboutCommand());
registry.register(new HelpCommand(registry));
This PR automatically cherry-picks commit 06fcdc2 to patch version v0.37.0 in the stable release to create version 0.37.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: