Project tool window | context menu of a folder | Compare Directory with
Project tool window | context menu of two selected folders | Compare Directories
Project tool window | context menu of a folder | Sync with Deployed to
Remote Host tool window | context menu of a folder | Sync with local
Tools | Deployment | Sync with local
Database tool window | context menu of two selected items | Compare
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, tables or columns).
In this dialog box, explore the detected differences and synchronize the compared items.
You can also open the difference viewer without running PhpStorm. This is done through the following command: <path to PhpStorm executable file> diff <path_1> <path_2> where path_1 and path_2 are paths to the folders in question.
In this section:
|Item||Tooltip and shortcut||Description||Available for|
Ctrl+F5Ctrl+F5Ctrl+5Ctrl+F5Ctrl+F5Ctrl+Alt+RCtrl+F5Ctrl+F5Command RControl F5Command R
|Click this button to refresh the contents of the differences viewer.||All|
Show new on left side
|Press this toggle button to have PhpStorm 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 new on right side||Press this toggle button to have PhpStorm show the items, that are present in the second of the compared directories or database objects and are missing in the first one.||All|
|Show difference||Press this toggle button to have PhpStorm 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 equals||Press this toggle button to have PhpStorm show items that are present in both folders or database objects but differ in contents, or timestamp, or size.||All|
In this drop-down list, select the parameter to be used for comparison. The available options are:
|Click this button to have PhpStorm apply the specified action to the selected pair of items. Actions to be performed are shown in the * field.||All|
Ctrl+EnterCtrl+EnterCtrl+EnterCtrl+EnterCtrl+EnterCtrl+EnterCtrl+EnterCtrl+EnterControl EnterControl EnterControl Enter
|Click this button to have PhpStorm 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 EnterEnterEnterEnterEnterEnterEnterEnterEnterEnterEnter.
|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
The list shows the items from the compared objects that meet the comparison criterion specified in the Compare by drop-down list and the filtering criteria specified through the toolbar buttons.
|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
To change the currently selected action, click the icon.
The differences pane only shows 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.
|Click this button to place to the clipboard the fragment of code selected in the preview pane. If nothing is selected, the whole line at caret is copied.|
|Click this button to initiate the find in text procedure in the differences viewer.|
F7F7F7F7F7F11 or F8F7F5F7F7F5 or Shift+F7Shift+F7Shift+F7Shift+F7Shift+F7Shift+F7Shift+F7Ctrl+F5Shift F7Shift F7Alt F5
|Click this button to move to the next / previous difference.|
|Ignore whitespace||Use this drop-down list to define how the differences viewer should treat white spaces in the text.
|or||Use these chevron buttons to apply differences between files.|