ci: Add Gemini conflict resolution to cherry-pick

[oxve]

This change integrates the Gemini API into the cherry-pick workflow to
automatically resolve merge conflicts. When a cherry-pick fails, the
gemini-cli action is invoked to attempt to resolve any conflicts.
This reduces manual intervention for routine cherry-picks.

Bug: 488071229

[github-actions]

🤖 Gemini Suggested Commit Message

---

ci: Add Gemini conflict resolution to cherry-pick

This change integrates the Gemini API into the cherry-pick workflow.
When a cherry-pick operation encounters merge conflicts, a Python
script is now automatically invoked. This script utilizes Gemini
2.0 Flash to analyze the conflict markers and generate a resolution
for the conflicting files. This automation helps to reduce manual
intervention required for routine cherry-picks, improving the
efficiency of the workflow.

Bug: 488071229

---

💡 Pro Tips for a Better Commit Message:

1. Influence the Result: Want to change the output? You can write custom prompts or instructions directly in the Pull Request description. The model uses that text to generate the message.
2. Re-run the Generator: Post a comment with: /generate-commit-message

[gemini-code-assist]

Code Review

This pull request introduces a Python script to automatically resolve merge conflicts using the Gemini API, which is an innovative approach to automating a common developer task. However, it introduces significant security risks. The primary concern is the automatic staging of LLM-generated code without validation, which, when combined with prompt injection vulnerabilities, could lead to malicious code being committed. Additionally, the script leaks the Gemini API key into CI/CD logs if the API request fails. Recommendations include removing the automatic git add step, passing the API key via headers, and improving the script's readability and maintainability by using native Python libraries for HTTP requests.

[oxve]

/gemini review