- Windows/Linux/macOS
- Java 8
- Gradle 4.10.1
-
Clone the repo and import dependencies with Gradle.
-
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.