fix(patch): cherry-pick 7ec7845 to release/v0.15.0-preview.1-pr-12905 [CONFLICTS]#12962
Conversation
# Conflicts: # schemas/settings.schema.json
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 of a commit aimed at improving 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.
Code Review
This PR cherry-picks a commit to rename write_todos_list to write_todos and enable it by default. The changes across the documentation, configuration, and tests are consistent. However, there is a critical unresolved merge conflict in schemas/settings.schema.json which makes the file invalid. This must be resolved before merging.
| "useWriteTodos": { | ||
| <<<<<<< HEAD | ||
| "title": "Use Write Todos", | ||
| "description": "Enable the write_todos_list tool.", | ||
| "markdownDescription": "Enable the write_todos_list tool.\n\n- Category: `Advanced`\n- Requires restart: `no`\n- Default: `false`", | ||
| "default": false, | ||
| ======= | ||
| "title": "Use WriteTodos", | ||
| "description": "Enable the write_todos tool.", | ||
| "markdownDescription": "Enable the write_todos tool.\n\n- Category: `Advanced`\n- Requires restart: `no`\n- Default: `true`", | ||
| "default": true, | ||
| >>>>>>> 7ec78452 (Enable write_todo tool and fix output function schema (#12905)) | ||
| "type": "boolean" | ||
| }, |
There was a problem hiding this comment.
This file contains an unresolved merge conflict which makes it an invalid JSON file. Please resolve the conflict before merging. It seems the correct resolution is to combine changes from both sides of the conflict.
"useWriteTodos": {
"title": "Use Write Todos",
"description": "Enable the write_todos tool.",
"markdownDescription": "Enable the write_todos tool.\n\n- Category: `Advanced`\n- Requires restart: `no`\n- Default: `true`",
"default": true,
"type": "boolean"
},|
Size Change: +967 B (0%) Total Size: 20.5 MB ℹ️ View Unchanged
|
This PR automatically cherry-picks commit 7ec7845 to patch version v0.15.0-preview.1 in the preview release to create version 0.15.0-preview.2.
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: