A semistructured merge tool for JavaScript applications.
This project uses Gradle to manage all dependencies and versioning.
Double-click on the jar from the /installer folder.
In case double-click does not work, install with the command
java -jar s3mInstaller.jar
Usage data (such as the number of detected conflicts, number of merged scenarios, and more useful details for studying the benefits and drawbacks of the tool) is stored in the $HOME/.jfstmerge folder. A summary of collected statistics that might help one decide to continue using the tool is available in the jfstmerge.summary file.
After installation, the tool is automatically integrated with git, with no need for further configuration. Then every time you invoke the git merge command, the tool is executed.
Use the jar from the /binary folder, or from the installed folder.
-
Merging 3 files:
java -jar pathto/jFSTMerge.jar -f "mine" "base" "theirs" -o "output"
Where mine, base, theirs and output are filepaths. The attribute -o is optional, if omitted, theirs is used as the output file.
-
Merging 3 directories:
java -jar pathto/jFSTMerge.jar -d "mine" "base" "theirs" -o "output"
Where mine, base, theirs and output are directory paths. The attribute -o is optional, if omitted, theirs is used as the output directory.