WebStorm 9.0.2 Web Help

Running WebStorm as a Diff or Merge Command Line Tool

In this topic:

Overview

Besides using WebStorm as an Integrated Development Environment, you can use it as a command line tool for comparing and merging files.

WebStorm executable is platform-dependent: WebStorm.exe or WebStorm.bat for Windows and WebStorm.sh for Linux.

For OS X, the executable is /Applications/WebStorm.app/Contents/OS X/.... To add the launcher to your path, add its containing directory /Applications/WebStorm.app/Contents/OS X.

Enabling invocation of WebStorm operations from the command line

To enable invoking WebStorm operations from the command line, do one of the following

  • Using the command line commands, for example, cd to change the directory, switch to the directory where the WebStorm executable file is located (WebStorm installation directory). The CMD commands, the name of the WebStorm executable, and its default location depend on the operating system you use. See the lists of CMD commands for Windows, OS X, Linux.
  • Specify the location of the WebStorm executable in the Path system environment variable. In this case, you will be able to invoke the WebStorm executable and other WebStorm command from any directory.

Comparing files using WebStorm as a diff command line tool

To compare two files using WebStorm as a diff command line tool

  1. Enable invoking WebStorm operations from the command line.
  2. Type the following command at the command line prompt:
    <WebStorm launcher> diff <path to file1> <path to file2>
    where file1 is your local copy, file2 is the repository version.

Merging files using WebStorm as a command line tool

Most often you need to merge three versions of the same file: your local version, the version in the repository or in the upstream, and the base revision, which is the origin for the two diverged versions.

To merge files using WebStorm as a command line tool

  1. Enable invoking WebStorm operations from the command line.
  2. Type the following command at the command line prompt:
    <WebStorm launcher> merge <path to file1> <path to file2> <path to file3> <path to output>
    where file1 is your local copy, file2 is the repository version, file3 is the base revision for file1 and file2, and output is the file to save the merge results in (optional).

See Also

Last modified: 11 December 2014
comments powered by Disqus