Merge files from the command line

You can find the executable for running WebStorm in the installation directory under bin. To use this executable as the command-line launcher, add it to your system PATH as described in Command-line interface.

Syntax

webstorm64.exe merge <path1> <path2> [<base>] <output>

Example

To perform a three-way merge, you need to specify paths for two modified versions of a file, the base revision (a common origin of both modified versions), and the output file to save merge results:

webstorm64.exe merge C:\MyProjectCopy\Readme.md C:\FriendsProjectCopy\Readme.md C:\Archive\Readme.md C:\MainProject\Readme.md

Don't specify the optional base revision if you want to treat the current contents of the output file as the common origin. In this case, if the output is an empty file, this essentially becomes a two-way merge.

By default, WebStorm does not provide a command-line launcher. For information about creating a launcher script for WebStorm, see Command-line interface.

Syntax

webstorm merge <path1> <path2> [<base>] <output>

Example

To perform a three-way merge, you need to specify paths for two modified versions of a file, the base revision (a common origin of both modified versions), and the output file to save merge results:

webstorm merge ~/MyProjectCopy/Readme.md ~/FriendsProjectCopy/Readme.md ~/Archive/Readme.md ~/MainProject/Readme.md

Don't specify the optional base revision if you want to treat the current contents of the output file as the common origin. In this case, if the output is an empty file, this essentially becomes a two-way merge.

You can find the script for running WebStorm in the installation directory under bin. To use this script as the command-line launcher, add it to your system PATH as described in Command-line interface.

Syntax

webstorm.sh merge <path1> <path2> [<base>] <output>

Example

To perform a three-way merge, you need to specify paths for two modified versions of a file, the base revision (a common origin of both modified versions), and the output file to save merge results:

webstorm.sh merge ~/MyProjectCopy/Readme.md ~/FriendsProjectCopy/Readme.md ~/Archive/Readme.md ~/MainProject/Readme.md

Don't specify the optional base revision if you want to treat the current contents of the output file as the common origin. In this case, if the output is an empty file, this essentially becomes a two-way merge.