-
Using the command line commands, for example, cd to change the directory,
switch to the directory where the RubyMine executable file is located (RubyMine installation directory).
The CMD commands, the name of the RubyMine executable, and its default location depend on the operating system you use.
See the lists of CMD commands for Windows
, Mac OS
,
Linux
.
- Specify the location of the RubyMine executable in the Path system environment variable. In this case, you will be able to invoke the RubyMine executable and other RubyMine command from any directory.
- Enable invoking RubyMine operations from the command line.
-
Type the following command at the command line prompt:
where file1 is your local copy, file2 is the repository version.
<RubyMine launcher> diff <path to file1> <path to file2>Note
- If you have specified the location of the RubyMine executable as a Path environment variable, the command will work no matter which directory you are currently in. Otherwise, you need to switch to the RubyMine installation folder first or specify the full path to the executable.
-
RubyMine executable is platform-dependent: RubyMine.exe
or %product.bat for Windows and RubyMine.sh for Linux.
For Mac OS, the executable is /Applications/PhpStorm.app/Contents/MacOS/webide. To add the launcher to your path, add its containing directory /Applications/PhpStorm.app/Contents/MacOS.
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.
- Enable invoking RubyMine operations from the command line.
-
Type the following command at the command line prompt:
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).
<RubyMine launcher> merge <path to file1> <path to file2> <path to file3> <path to output>
