A
AI Conflict Resolver
JetBrainsmattyatea · 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
Collected
2026-11-04
weekly snapshot
Similar in “AI”
J
JetBrains AI Assistant
JetBrains
4.1★
(1 444)
250.3M
AI
J
Junie, the AI coding agent by JetBrains
JetBrains
4.1★
(510)
37.2M
AI
S
SonarQube for IDE
SonarSource
4.1★
(160)
16.2M
AI
W
Windsurf Plugin for Python, JS, Java, Go...
Codeium
4.1★
(1 525)
10.4M
AI
C
Claude Code [Beta]
anthropic
4.1★
(482)
5M
AI
Q
Qoder - Agentic AI Coding Platform
qoder
4.1★
(115)
3.7M
AI