Differences viewer for folders
This window is displayed every time you explore differences between:
- Two local directories (local history for folders, recent changes, or version control).
- A remote folder and its local version.
- Two database objects (data sources, schemas or tables).
In this dialog box, explore the detected differences and synchronize the compared items.
In this section:
|Item||Tooltip and shortcut||Description||Available for|
|Use these buttons to jump to the next/previous difference.||Version control|
|Jump to Source
|Click this button to open file in the editor's active tab. The caret will be placed in the same position as in the Differences Viewer.||All|
|Show diff in external tool||Click this button to invoke an external differences viewer, specified in the
External Diff Tools page.
This button only appears on the toolbar, when the check box Use external diff tool is selected in the External Diff Tools page.
|Click this button to show reference page.||All|
|Click this button to refresh the contents of the differences viewer.||All|
|Show new files on left side||Press this toggle button to have IntelliJ IDEA show the items, that are present in the first of the compared directories or database objects and are missing in the second one.||All|
|Show difference||Press this toggle button to have IntelliJ IDEA show items that are present in both folders or database objects but differ in contents, or timestamp, or size.||All|
|Show equals||Press this toggle button to have IntelliJ IDEA show the items that are present in both directories or objects and have the same contents, or timestamp, or size, depending on the parameter for comparison specified in the Compare by drop-down list.||All|
|Show new files on right side||Press this toggle button to have IntelliJ IDEA show the items, that are present in the second of the compared directories or database objects and are missing in the first one.||All|
In this drop-down list, select the parameter to be used for comparison. The available options are:
|Click this button to have IntelliJ IDEA apply the specified action to the selected pair of items. Actions to be performed are shown in the * field.||All|
|Click this button to have IntelliJ IDEA apply the specified action to all the pairs of items in the list. Actions to be performed are shown in the * field.||All|
|Hide excluded files||Click this button to suppress showing files excluded from synchronization.||Local-remote folders|
|Filter||Type the filtering string (for example, file or table name). Use * wildcard to replace any number of
Note that filter applies on pressing Enter.
|Path||These fields show the paths to the folders being compared. To change a directory, click the Browse button and specify another directory in the dialog that opens.||
|These read-only fields show the names of the data sources or tables being compared.||Data sources|
List of items
|Name||These read-only fields show the names of files, data source tables, or table fields under the object specified in the Path or fields.||All|
|Size||These read-only fields show the sizes of files under the folders being compared.||
|Date||These read-only fields show the timestamps of files under the folders being compared.||
The icon in this field indicates the action that will be applied to the pair of items in the current line
upon clicking the Synchronize Selected or
Synchronize All toolbar button.
To change the currently selected action, click the icon.
The differences pane is displayed only for files, data source tables, or table fields with the same names, which exist on both sides. For the files and DB objects that exist on one side only, the contents of the selected file/DB object is displayed.
If the files have read-only status, they are not editable in the differences pane.
This menu appears on right-clicking an entry in the list of items. The commands listed below define actions to be taken for the selected entry and set the action icons in the * column.
|Set Copy to Right/Left||This command sets the specified icons in the * column to copy a file missing from one of the directories. If a file exists on one side, it will be copied; if it doesn't exist, then the file on the other side will not be deleted.|
|Set Delete||This command sets the specified icons in the * column to delete file.|
|Set Do Nothing||Choose this command to remove an action icon.|
|Set Default||Choose this command to set the default action for the entry.|
|Warn When Delete||Select this option to display a warning when trying to delete a file that is located only in one of the two directories during their merge.|
File comparison statuses and intended operations are shown in the column marked with an asterisk (*). To assign or change an operation, use the context menu associated with the corresponding cell. Alternatively, click the cell or press Space one or more times.
- (Enter) applies the operations to selected files.
- (Ctrl+Enter) applies the operations to all the files.
The file exists only in the left-hand folder.
The intended operation is to copy the file to the right-hand folder.
If a file exists in both folders and you apply this operation, the file in the right-hand folder is overwritten.
For the selected comparison criterion, the files are not identical.
No operation is assumed.
Study the file differences in the lower part of the view. You can choose to overwrite one of the files by assigning and applying the corresponding operation. You can as well modify the file contents.
This may be done by typing or by using the following buttons and context menu commands:
To undo the changes, use Ctrl+Z.
|For the selected comparison criterion, the files are identical. No operation is assumed.|
The file exists only in the right-hand folder.
The intended operation is to copy the file to the left-hand folder.
If a file exists in both folders and you apply this operation, the file in the left-hand folder is overwritten.
|Delete the file. The operation is not available for files that exist in both folders.|