⚔️ Git Conflict Resolver
Visual 3-way diff · Click to resolve · Keyboard shortcuts
Paste file with conflict markers
🔍 Parse Conflicts
Conflicts
Accept All Ours
Accept All Theirs
↩ Undo
↪ Redo
Resolved Output
📋 Copy
Keyboard Shortcuts
O
Accept ours for focused conflict
T
Accept theirs
↑↓
Navigate conflicts
Ctrl+Z
Undo
Ctrl+Y
Redo