Conflict Solver

Use Tools|Conflict Solver to start a kind of Three-Way-Merge, which can be invoked on conflicting files (see Primary File States). For details, refer to Conflict Solver.