Merge Preview (Pro Only)
The Merge Preview is the result of a Merge command
invoked from the Project Window.
It shows a Directories/Files structure of which files and directories will
be affected by the merge.
For every file, the table shows the corresponding Name and its Relative Directory, according
to the merge root.
State shows the merge state for the file, either Modified, Added, Removed
or Unchanged.
For Modified files, both the Content as well as the Properties
can be either Conflicting, Modified or Unchanged.
Merge menu
-
Use Show Changes to show the File Compare
between the current local file and the merge Result for the selected
file.
This command will only be applicable for Modified and for Conflicting
files.
-
Use Show 3-Way-Merge Changes to show the Conflict Solver
for the selected file, previewing the detailled changes and conflicts which can be
expected when actually performing the merge.
-
Use Perform Merge to actually perform the merge exactly as it has been previewed
here.
If you had initially selected a merge revision range containing HEAD, these
ranges will have been adjusted.
This prevents the final merge from including any new revisions which had been committed
after previewing the merge.
-
Use Close to close the frame.
View menu
-
Select Files From Subdirectories to toggle the display of files from subdirectories
of the currently selected directory.
Window menu
Refer to Window for more details.