{"push_id":537444148,"size":2,"distinct_size":2,"ref":"refs/heads/java_merge","head":"b684d9ac8b7e359fdfdbeea42231e4c3f5ffb624","before":"cfe165b1abcfa54292cfce5f40801e83282daa16","commits":[{"sha":"e7a2fed8d756f519ada704766b7ae1a3ba39cecf","author":{"email":"4adeae695e7ef7352fa416ce505716bcc2033329@lesfurets.com","name":"Arnaud Pflieger"},"message":"use a custom merge logic instead of the octopus strategy, so the script can use a different git-merge-one-file.\nthis intend to resolve common annoying conflicts related to java syntax","distinct":true,"url":"https://api.github.com/repos/lesfurets/git-octopus/commits/e7a2fed8d756f519ada704766b7ae1a3ba39cecf"},{"sha":"b684d9ac8b7e359fdfdbeea42231e4c3f5ffb624","author":{"email":"4adeae695e7ef7352fa416ce505716bcc2033329@lesfurets.com","name":"Arnaud Pflieger"},"message":"custom merge script for java","distinct":true,"url":"https://api.github.com/repos/lesfurets/git-octopus/commits/b684d9ac8b7e359fdfdbeea42231e4c3f5ffb624"}]}