I am going to read in some files that are changed versions of an original. i.e. an original is distributed to more people, they change it and send it back, then I have to merge all their changes for version N+1, and then give them back the file for improvement, it diverges again, then I have to merge for N+2, and so on.
Does anyone know of a difference engine I could use with Java? I want to be able to pass it the original, and the branches, and it should do the magic of merging. If a conflict arises, then it should tell me what happened and not merge the files.
Any pointers would be great to have.