WebStorm lets you review the differences between any two files, folders, text sources, or database objects, as well as between local files and their repository versions.
Compare files
WebStorm displays the differences in the Differences Viewer for Files:
File Compare is a GUI front-end to the md5 Unix command. With this small app you can compare two files and discover whether they are digitally identical. You can use File Compare to check all types of files: images, music, documents, etc. System Requirements: Mac OS X 10.4.x, 10.5.x. DiffFork is a diff tool for Mac OS X. DiffFork can compare both folders and files, presenting differences in a visual format. Not an alternative? Report a problem. By SourceGear, LLC. DiffMerge is an application to visually compare and merge files. Product Features Diff. Graphically shows the changes between. DeltaWalker - world's most advanced and intuitive two- and three-way visual file and folder comparison for Mac OS X, Windows and Linux. Use DeltaWalker to compare (diff) and merge files, compare and synchronize folders.
To apply changes use the chevron buttons and .
To append changes, press Ctrl: the buttons will turn to .
Select the files you want to compare in the Project tool window.
From the context menu, choose Compare Files, or press Ctrl+D .
You can also select one file, choose Compare With from the context menu, and select a file that is outside your project.
Right-click anywhere in the editor and choose Compare with Clipboard from the context menu.
Right-click the file you want to compare with the currently opened file in the Project tool window.
Choose Compare File with Editor from the context menu.
If you often need to compare files that are outside your project with the active editor, or don't want to have the Project tool window open, you can use the Compare File with Editor option that lets you choose any file and compare it with the active editor.
To add this action to the editor tab's context menu:
In the Settings/Preferences dialog Ctrl+Alt+S, click Menus and Toolbars under Appearance and Behavior.
In the right pane, expand the Editor Tab Popup Menu node, click Add After, and choose the Compare File with Editor action under Version Control Systems | Diff & Merge.
Select a modified file anywhere in the Version Control tool window.
Click on the toolbar or press Ctrl+D.
Productivity tips
To assign shortcuts to the apply and append actions, in the Settings/Preferences dialog Ctrl+Alt+S select Keymap on the left and locate these actions under Version Control Systems | Diff & Merge.
When you are comparing two files, or a file with the Cliboard contents, you can swap sides by clicking on the toolbar.
Compare folders
WebStorm lets you compare files in two folders against their file size, content, or timestamp. The differences are displayed in the Differences Viewer for Folders:
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).
You can also open the difference viewer without running WebStorm. Run the following command: <path to WebStorm executable file> diff <path_1> <path_2> where path_1 and path_2 are paths to the folders you want to compare.
Select the folders you want to compare in the Project tool window.
From the context menu, choose Compare Directories, or press Ctrl+D .
Use the following toolbar buttons to filter the list:
: click to display files that are present in the left folder, but are missing from the right one.
: click to display files that are present in the right folder, but are missing from the left one.
: click to display files that are present in both folders, but whose contents, timestamp or size are different.
: click to display files that are present in both folders and that are identical with regard to the option selected in the Compare by dropdown.
WebStorm lets you sync the contents of two folders, or apply changes from one folder to another.
For each file, click the icon in the * column until you've set an action to be taken on that file.
: copy the selected item from the left to the right folder. If such file already exists in the right folder, it will be overwritten.
: copy the selected item from the right to the left folder. If such file already exists in the left folder, it will be overwritten.
: no action will be performed (the two files are identical).
: no action will be performed (the two files are different).
: remove the selected item.
Do one of the following:
To apply the selected action to the current item, click the Synchronize Selected button on the toolbar.
To apply the selected actions to all items, click the Synchronize All button on the toolbar.
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). These may be versions of the same file that you want to compare. Also, there may be a situation when you think a file was renamed, but is otherwise identical to a file in another folder. WebStorm 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.
This action is only available for files in folders with the same relative path.
Select the files you want to compare in the left and the right pane.
Click the Compare New Files with Each Other icon on the toolbar. The differences between the selected files will be displayed in the bottom pane.
Compare any text sources
Apart 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. 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.
Press Ctrl+Shift+A and start typing to locate the Open Blank Diff Window action.
Paste any text you want to compare in the left and right panels.
Mac Documents Folder Missing
Productivity tips
In the Settings/Preferences dialog Ctrl+Alt+S select Keymap and locate this action under Version Control Systems | Diff & Merge.
Folder Diff Macos
You can swap sides in the Diff Viewer by pressing the icon on the toolbar.