https://github.com/deezer/java-diff-merge-tool
A smart tool to provide diff/merge resolution for Java files
https://github.com/deezer/java-diff-merge-tool
Last synced: 9 months ago
JSON representation
A smart tool to provide diff/merge resolution for Java files
- Host: GitHub
- URL: https://github.com/deezer/java-diff-merge-tool
- Owner: deezer
- License: mit
- Created: 2014-10-22T14:08:17.000Z (about 11 years ago)
- Default Branch: master
- Last Pushed: 2015-08-25T16:44:27.000Z (over 10 years ago)
- Last Synced: 2025-02-10T18:15:08.278Z (11 months ago)
- Language: Java
- Size: 310 KB
- Stars: 3
- Watchers: 6
- Forks: 0
- Open Issues: 0
-
Metadata Files:
- Readme: README.md
- License: LICENSE
Awesome Lists containing this project
README
# Java Diff/Merge tool
Java Diff/Merge tool is a utility used to provide information and automatic resolution for merge conflicts on Java files.
## Running
This project is under active development but is not ready to be used yet...
## Objectives
Use only this tool to perform merges in our production environment
## Changelog
### v0.1 (2012-10-22)
- Initial commit
## TODOs and Possible Features
- ...
## Development
Help for this project is more than welcomed, so feel free to [create an issue](https://github.com/deezer/java-diff-merge-tool/issues) or to [send a pull request](https://github.com/deezer/java-diff-merge-tool/pulls).
## License
The Java Diff/Merge tool is licensed under the MIT License (see the [LICENSE](LICENSE) file)
## Credits
This project was made possible thanks to several Open Source Projects :
- [JavaParser](https://code.google.com/p/javaparser/) : a tool converting Java Source files into Abstract Syntax Trees