Git Merge Conflict Resolver

The merge hit a conflict and the file came back with those angle-bracket markers sitting in the middle of your code. In the editor, with broken indentation and both versions jammed together, it is easy to delete the wrong line and only find out at code review. Paste the whole file here and each conflict appears on its own, with each branch's side in a separate block and the line numbers involved.

For every conflict you choose what stays: your side, the incoming side, both in sequence, or, when the merge used diff3, the base version the divergence came from. The tool reassembles the file with your choices applied and hands back a result ready to paste, leaving the rest of the file untouched and keeping the original line ending, whether LF or CRLF.

The summary flags the cases usually resolved on autopilot: conflicts where both sides are identical, and those where one side is empty, typical of reordered imports. Orphan markers left by a botched hand edit show up as a warning rather than breaking the parse. The pasted file never leaves the browser, so it is safe to use with work code.