Here is an idea that might work: 1. Merge the splitted files back into one file.
2. Git can now compare the changed original document to the merged document. And thus perhaps GIT can now merge changes from original document to merged document. 3. Then to re-split the files, use markers to indicate where the merged document should be split, example, this could even be some encoding to unique identify each pieces -=-=-=---=-=-=--==-=----==-=-=-=--------=-=-=--=-=-=-=-=----=-=-=-=-======-=-==-=-=-= file 1 -=-=-=-=-------------------------------=-=-=-==-===--------------------------------===------------- file 2 ==-=-=-=---------------------===-=-=-----------------------------------------------------------------= file 3 ===------------------------------------------------------------------------------------------------------- Now write a tool which can split this file according to these marker lines. Fun thing: This functionality/idea could be implemented directly into GIT as a feature so users don't have to do this manually. I haven't tried this idea yet, so I have no idea how good GIT is at moving changes around in files. Especially with Delphi files some words may be repeated in file 1,2,3 like unit interface implementation... But it's worth a try sometime ! ;) Bye, Skybuck. -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/git-users/0a79ea73-a25f-48d2-a57b-92e0d490d91an%40googlegroups.com.
