A

AI Conflict Resolver

JetBrains

mattyatea · v—

AI Conflict Resolver is an IntelliJ IDEA plugin that helps you resolve Git merge conflicts using AI CLI tools such as Codex CLI and Gemini CLI. Features Automatically detect conflict markers and request resolution from AI. Support for Codex CLI and Gemini CLI. Automatic application or preview of resolution results. Custom prompt template support.

AICode EditingCode ToolsMenu ComponentsTools Integration
Open in store ↗ id: 29439
Downloads
280
280
Rating
— ★
— ratings
Category
AI
JetBrains Marketplace
Collected
2026-11-04
weekly snapshot

Similar in “AI”