Removedor de Marcadores de Conflicto de Git

Removedor de Marcadores de Conflicto de Git

Resolve git merge conflicts quickly without an IDE. Paste code with conflict markers, choose which version to keep for each conflict, and get clean output — ready to commit.

Cómo utilizar

Paste your file containing git conflict markers (<<<<<<< HEAD, =======, >>>>>>>). The tool detects and highlights each conflict. For each one, choose to keep the current branch (HEAD), the incoming branch, or both. Use bulk actions to resolve all conflicts at once. Copy or download the cleaned result.

Características

• Per-conflict resolution – Choose keep HEAD, keep incoming, or keep both for each individual conflict
• Bulk actions – Accept all HEAD, all incoming, or all both with one click
• Progress tracking – See how many conflicts remain and track resolution progress
• Malformed marker warnings – Alerts when conflict markers are incomplete or incorrectly formatted
• Carga de archivos – Upload conflicted files directly instead of pasting
• Copy and download – Copy resolved output or download as a file
• Client-side only – Your code never leaves your browser