Git Merge Conflict Resolver

Paste your conflicting files, see a visual diff of 'Mine' (HEAD) vs. 'Theirs' (Incoming), and edit the final output.

Paste 'Mine' (HEAD) Content:

Paste 'Theirs' (Incoming) Content:

Mine (HEAD)

Theirs (Incoming)

Resolved Output (Editable)