- Windows/Linux/macOS
- Java 8
- Maven 3.6.1
- Clone the repo and run the following command under the root directory of the cloned repo to import dependencies:
mvn initialize
-
Clone the sample input data from: https://github.com/Symbolk/intellimerge-sample-input.
-
Checkout the two local branches to be merged:
git checkout ours
git checkout theirs
git checkout master
-
Edit the file
Main.java
to replace therepoPath
to the path where you cloned the sample input. -
Run
Main.main()
to start merging.