Classify merge-conflict hunks as safe mechanical resolutions or risky; risky hunks stay manual.
Maintain this server? Claim it
This server only runs locally, from a package. Install it with the instructions on this page to try it.
Pick your client. Values in capitals, like YOUR_TOKEN, are yours to fill in.
claude mcp add conflictfix \ -- npx -y @reneturcios/[email protected]
We don't run packages, so we can't list this server's tools.