Skip to content

Sync main to patch-1 via merge#5

Draft
Copilot wants to merge 5 commits intomainfrom
copilot/sync-main-to-patch-1
Draft

Sync main to patch-1 via merge#5
Copilot wants to merge 5 commits intomainfrom
copilot/sync-main-to-patch-1

Conversation

Copy link
Copy Markdown

Copilot AI commented Nov 10, 2025

Integrated upstream changes from google-github-actions:main (commit f0248ee) into the patch-1 branch.

Changes

  • Merged main branch into patch-1 to bring in upstream repository sync
  • Resolved conflict in scripts/setup_workload_identity.sh by preserving patch-1's removal of GOOGLE_GENAI_USE_VERTEXAI documentation lines

Result

patch-1 now contains all upstream changes while maintaining its commit (e7fbc5e) that adds the GOOGLE_GENAI_USE_VERTEXAI variable setting. The only diff from main is the intentional removal of 4 documentation lines in the setup script.

Original prompt

sync main to patch-1 by git merge with rebase


💬 We'd love your input! Share your thoughts on Copilot coding agent in our 2 minute survey.

Copilot AI changed the title [WIP] Sync main branch with patch-1 using rebase Sync main to patch-1 via merge Nov 10, 2025
Copilot AI requested a review from huan November 10, 2025 20:27
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