Conflict Solver
The Conflict Solver is a kind of Three-Way-Merge.
The content of the current file (which contains the conflicts) is displayed in the
center text area ('merge view').
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 is invoked by Query|Conflict Solver from the Project Window.
The Conflict Solver works similar to the File Compare, see
also Comparison for details.
File menu
-
Use Save to save changes to the merged file.
SmartSVN will detect, whether all conflicts have been resolved and in this case also
automatically mark the file as resolved (see Mark Resolved).
-
Use Close to close the frame.
Edit menu
Refer to File Compare.
View menu
-
Use All to display all three file contents side-by-side.
-
Use Left and Merge to display the left view beside the merge view.
-
Use Merge and Right to display the merge view beside the right view.
-
Use Left and Right Above Merge to display the merge view below the left and
right view.
-
Use Left Above Right to display the left file above the right file.
This can be convenient when having files with long lines.
-
Ignore Whitespace for Line Comparison, refer to Built-in Text Editors.
-
Settings, refer to Built-in Text Editors.
In addition, on the Compare page, Compare with Base can be selected.
With this option selected, the content of the center component will not only be compared
against the left and the right content, but also against the (invisible) content
of the base file: Lines in the left, center and right content which are not equal
are also compared to the corresponding lines of the base file and the highlighting
depends on the result of this comparison.
Go To menu
In the addition to the Go To found in the File Compare, following
commands are available:
-
Use Previous Conflict to scroll to the previous conflicting difference within
the active view, relative to the current cursor location.
-
Use Next Conflict to scroll to the next conflicting difference within the
active view, relative to the current cursor location.
Window menu
Refer to Window for more details.