This is a Visual Studio Code extension that uses Google's Generative AI (Gemini-2.0-flash as the default model) to automatically resolve Git merge conflicts in code files.
Key Features
Automated Conflict Resolution: Uses AI to resolve Git merge conflicts in the active text editor
Status Bar Integration: Shows a status bar item when conflicts are detected in the current file
Technical Implementation
VS Code Integration: Registers a command that can be triggered from the status bar or command palette
Conflict Detection: Uses regex to find standard Git merge conflict markers
AI Utilization: Leverages Google's Gemini/Gemma AI model to analyze and resolve conflicts intelligently
Diff3 Algorithm: Uses the diff3 package to help find common ancestors of conflicting code sections
Configure the extension
The extension can be configured in the VS Code settings under Extensions > Gemini Resolver:
Add your Gemini API key to the Gemini Resolver: Api Key field
Select the Gemini model to use for the resolver from the Gemini Resolver: Model dropdown
