toolbox #197 · git conflict planning

Merge Conflict Compass

Paste a merge conflict, pick the conflict type, and get a practical resolution plan. It scores the risk, suggests the right merge strategy, and turns noisy hunks into a copy-ready brief so you can fix the branch without spiraling into tab archaeology.

Best forGit merges, PR conflicts, branch reconciliation
OutputConflict score, strategy, resolution notes
ModeDark UI, mobile-responsive, single-file
Buy Me a Coffee

Conflict inputs

signals

Resolution plan

medium risk
Conflict score58 / 100
Recommended moveManual review
Primary riskBehavior drift

Copy-ready merge note

ready to paste

Questions before resolving

prompts