Skip to content

fix(patch): cherry-pick ad21c10 to release/v0.6.0-preview.2 [CONFLICTS]#8805

Closed
github-actions[bot] wants to merge 1 commit intorelease/v0.6.0-preview.2from
hotfix/v0.6.0-preview.2/preview/cherry-pick-ad21c10
Closed

fix(patch): cherry-pick ad21c10 to release/v0.6.0-preview.2 [CONFLICTS]#8805
github-actions[bot] wants to merge 1 commit intorelease/v0.6.0-preview.2from
hotfix/v0.6.0-preview.2/preview/cherry-pick-ad21c10

Conversation

@github-actions
Copy link
Copy Markdown

This PR automatically cherry-picks commit ad21c10 to patch the preview release.

⚠️ 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/ui/AppContainer.tsx
#	packages/cli/src/ui/hooks/slashCommandProcessor.ts
@google-cla
Copy link
Copy Markdown

google-cla bot commented Sep 19, 2025

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

@mattKorwel mattKorwel closed this Sep 19, 2025
@mattKorwel mattKorwel deleted the hotfix/v0.6.0-preview.2/preview/cherry-pick-ad21c10 branch September 19, 2025 03:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants