About Git Merge Conflict Resolver

Paste a conflicted file and resolve each block, including diff3 style, side by side.

100% Free, secure, client-side developer utility. ExpectException provides private online tools directly in your browser with zero sign-up required.