- Make sure IntelliJ IDEA is running.
- On the main menu, choose
Tools
>Create Command-line Launcher
. The dialog box Create Launcher Script opens, with the suggested path and name of the launcher script. You can accept default, or specify your own path. - Make notice of it, as you'll need it later. Outside of IntelliJ IDEA, add the path and name of the launcher script to your path.
- Specify the location of the IntelliJ IDEA executable in the Path system environment variable. In this case, you will be able to invoke the IntelliJ IDEA executable and other IntelliJ IDEA commands from any directory.
For more information, visit https://www.jetbrains.com/help/idea/2016.2/running-intellij-idea-as-a-diff-or-merge-command-line-tool.html
- In windows 10, if you face some warning like “Could not open/create prefs root node …” Ref: http://stackoverflow.com/questions/16428098/groovy-shell-warning-could-not-open-create-prefs-root-node Thanks to @SanthoshDhandapani for this.
On Windows.
If Idea is already running, only first file get opened, for rest I get error that file does not exists.
There are two solutions to the problem.
trustExitCode = false
Then you need to visit commandline and say that you are finished with merging.