IntelliJ IDEA 2019.3 Help

Merge files from the command line

Open the Merge dialog to perform a three-way or a two-way merge from the command line.

Syntax
idea.bat 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:

idea.bat 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.

Syntax
idea 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:

idea 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.

Syntax
idea.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:

idea.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.

Last modified: 20 March 2020