Conflict Solver

The Conflict Solver is a kind of Three-Way-Merge, which can be invoked on conflicting files (see File States). The content of the current file (which contains the conflicts) is displayed in the center text area. The left and right text areas show the contents of the two files, which have been forked from the common base. The common base itself is not displayed, but regarded by the UI for highlighting changes and conflicts. All file contents are directly taken from the files, which SVN produces in case of conflicting changes.

The Conflict Solver allows only to alter the content of the current file. The Edit, Search and Goto menus provide various commands for changing the file content resp. resolving the conflicts. By the Layout menu, you can change the layout of the Conflict Solver.

After you have successfully resolved the conflicts, you can choose File|Save to save your changes to the file. SmartSVN will detect, whether all conflicts have been resolved and in this case also automatically mark the file as resolved (see Mark Resolved).