Description
Partially resolved merge conflicts can be reduced into clearer diffs for the remaining conflict work. The tool helps developers focus on unresolved changes after some manual resolution has already happened.
Conflict tools can alter files during a sensitive merge state. Keep a recovery path and review the final diff before marking conflicts as resolved.