fix(patch): cherry-pick dd01af6 to release/v0.8.2-pr-11072 [CONFLICTS]#11075
Conversation
# Conflicts: # packages/core/src/utils/retry.test.ts # packages/core/src/utils/retry.ts
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 aims to refine the retry mechanism within the core utility by decreasing the default maximum retry attempts from five to three. It is an automated cherry-pick operation that encountered merge conflicts, necessitating manual intervention to resolve the discrepancies before the changes can be integrated. 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
|
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
There was a problem hiding this comment.
Code Review
This pull request has unresolved merge conflicts from the cherry-pick, as noted in the description. The files packages/core/src/utils/retry.ts and packages/core/src/utils/retry.test.ts contain conflict markers which make the code invalid. These are critical issues that must be resolved before merging. My comments point to the exact locations of these conflicts.
| const promise = retryWithBackoff(mockFn); | ||
|
|
||
| // Expect it to fail with the error from the 5th attempt. | ||
| <<<<<<< HEAD |
There was a problem hiding this comment.
This line is the start of an unresolved merge conflict. The rest of the file contains more conflict markers (=======, >>>>>>>) which break the test suite. This is a critical issue. Please resolve all conflicts in this file and ensure the tests correctly verify that the default maxAttempts is 3.
| <<<<<<< HEAD | ||
| maxAttempts: 5, | ||
| ======= | ||
| maxAttempts: 3, | ||
| >>>>>>> dd01af60 (refactor: set max retry attempts to 3 (#11072)) |
There was a problem hiding this comment.
There are unresolved merge conflict markers in this block. This is a critical issue that will cause the build to fail. Please resolve the conflict to set maxAttempts to 3, as intended by the original commit.
maxAttempts: 3,
mattKorwel
deleted the
hotfix/v0.8.2/0.8.3/stable/cherry-pick-dd01af6/pr-11072
branch
5 participants
This PR automatically cherry-picks commit dd01af6 to patch version v0.8.2 in the stable release to create version 0.8.3.
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: