{"id":25215622,"url":"https://github.com/deezer/java-diff-merge-tool","last_synced_at":"2025-04-05T08:43:28.586Z","repository":{"id":22251302,"uuid":"25584902","full_name":"deezer/java-diff-merge-tool","owner":"deezer","description":"A smart tool to provide diff/merge resolution for Java files","archived":false,"fork":false,"pushed_at":"2015-08-25T16:44:27.000Z","size":317,"stargazers_count":3,"open_issues_count":0,"forks_count":0,"subscribers_count":6,"default_branch":"master","last_synced_at":"2025-02-10T18:15:08.278Z","etag":null,"topics":[],"latest_commit_sha":null,"homepage":null,"language":"Java","has_issues":true,"has_wiki":null,"has_pages":null,"mirror_url":null,"source_name":null,"license":"mit","status":null,"scm":"git","pull_requests_enabled":true,"icon_url":"https://github.com/deezer.png","metadata":{"files":{"readme":"README.md","changelog":null,"contributing":null,"funding":null,"license":"LICENSE","code_of_conduct":null,"threat_model":null,"audit":null,"citation":null,"codeowners":null,"security":null,"support":null}},"created_at":"2014-10-22T14:08:17.000Z","updated_at":"2019-01-08T16:07:12.000Z","dependencies_parsed_at":"2022-07-21T21:02:26.822Z","dependency_job_id":null,"html_url":"https://github.com/deezer/java-diff-merge-tool","commit_stats":null,"previous_names":[],"tags_count":0,"template":false,"template_full_name":null,"repository_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/deezer%2Fjava-diff-merge-tool","tags_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/deezer%2Fjava-diff-merge-tool/tags","releases_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/deezer%2Fjava-diff-merge-tool/releases","manifests_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/deezer%2Fjava-diff-merge-tool/manifests","owner_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/owners/deezer","download_url":"https://codeload.github.com/deezer/java-diff-merge-tool/tar.gz/refs/heads/master","host":{"name":"GitHub","url":"https://github.com","kind":"github","repositories_count":247312075,"owners_count":20918341,"icon_url":"https://github.com/github.png","version":null,"created_at":"2022-05-30T11:31:42.601Z","updated_at":"2022-07-04T15:15:14.044Z","host_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub","repositories_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories","repository_names_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repository_names","owners_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/owners"}},"keywords":[],"created_at":"2025-02-10T18:15:10.517Z","updated_at":"2025-04-05T08:43:28.552Z","avatar_url":"https://github.com/deezer.png","language":"Java","funding_links":[],"categories":[],"sub_categories":[],"readme":"# Java Diff/Merge tool\n\nJava Diff/Merge tool is a utility used to provide information and automatic resolution for merge conflicts on Java files. \n\n## Running\n\nThis project is under active development but is not ready to be used yet...\n\n## Objectives \n\nUse only this tool to perform merges in our production environment\n\n## Changelog\n\n### v0.1 (2012-10-22)\n\n - Initial commit\n\n## TODOs and Possible Features\n\n - ...\n\n## Development\n\nHelp 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).\n\n## License \n\nThe Java Diff/Merge tool is licensed under the MIT License (see the [LICENSE](LICENSE) file)\n\n## Credits\n\nThis project was made possible thanks to several Open Source Projects : \n\n - [JavaParser](https://code.google.com/p/javaparser/) : a tool converting Java Source files into Abstract Syntax Trees","project_url":"https://awesome.ecosyste.ms/api/v1/projects/github.com%2Fdeezer%2Fjava-diff-merge-tool","html_url":"https://awesome.ecosyste.ms/projects/github.com%2Fdeezer%2Fjava-diff-merge-tool","lists_url":"https://awesome.ecosyste.ms/api/v1/projects/github.com%2Fdeezer%2Fjava-diff-merge-tool/lists"}