On the Advanced Settings page of the IDE settings Ctrl+Alt+S, disable the Open Diff as Editor Tab option. You can configure the settings to open the viewer in a separate window instead. Open Diff in a separate windowīy default, Differences Viewer opens in an editor tab. You can swap sides in the Diff Viewer by pressing the icon on the toolbar. On the Keymap page of the IDE settings Ctrl+Alt+S, locate this action under Version Control Systems | Diff & Merge. Productivity tips Assign a shortcut for the 'Open Blank Diff' action Paste any text you want to compare in the left and right panels. Press Ctrl+Shift+A and start typing to locate the Open Blank Diff Window action. This can be useful, for example, if you want to compare an application's console output with the output of the same application albeit a little modified. The differences between the selected files will be displayed in the bottom pane.Īpart from comparing files' or folders' contents, you can open an empty Differences Viewer and paste any text or drag files into the right and left panels to compare. Select the files you want to compare in the left and the right pane.Ĭlick the Compare New Files with Each Other icon on the toolbar. This action is only available for files in folders with the same relative path. PhpStorm lets you compare two files, one of which is present in the right folder, and another one in the left even though such files are treated as different entities. Also, there may be a situation when you think a file was renamed, but is otherwise identical to a file in another folder. These may be versions of the same file that you want to compare. It’s now time to select your options and then click on the compare button. The paths to the selected folders are shown in the main window. Just select Folders at the top, click on the browse button at the right side and choose the folders you want to compare. Sometimes a file may be present in one folder, and another file with a similar name in the other folder (for example, VCS_library_1.4 and VCS_library_1.5). To compare two folders is also very easy. Run the following command: diff where path_1 and path_2 are paths to the folders you want to compare. You can also open the difference viewer without running PhpStorm. The top pane lists all files in the selected folders, while the bottom pane shows the differences between two versions of the selected file (see Compare files). The differences are displayed in the Differences Viewer for Folders:

PhpStorm lets you compare files in two folders against their file size, content, or timestamp. When you are comparing two files, or a file with the Cliboard contents, you can swap sides by clicking on the toolbar.

To assign shortcuts to the apply and append actions, open the Keymap page of the IDE settings Ctrl+Alt+S and locate these actions under Version Control Systems | Diff & Merge. Productivity tips Assign shortcuts for 'apply' and 'append' Select a modified file anywhere in the Version Control tool window.

Compare folders