Have you looked at the various --pickaxe and other file-following options that can be set to different levels of similarity for the tracking of such splitting and changing.
Sometimes the real problem is that the 'local' feature branch policies (i.e. your corporate way of doing things) can be in conflict with the underlying Git (Linux/Linus) philosophies of small changes, short lived branches, no mega-merges, etc. such that the apparent conflict resolutions (or failure to detect code movement) is easy for the dev to use git (with those extra parameters) to simply resolve the conflicts... I guess Git hopes that the dev provides the `deep learning [caffeine fuelled?] neural brain`.. ;-) while it provides some aggressive tools to follow those splits. Also look out for the discussions on the Git mailing list for the forthcoming ORT merge strategy (i.e. the `-sort` option ;-) https://blog.palantir.com/optimizing-gits-merge-machinery-part-v-46ff3710633e https://lore.kernel.org/git/CABPp-BGR3dfJE7TZ+jkjDdWyeXYowmJhtoFaQ8_Abn=zroh...@mail.gmail.com/ (as a starter) If you have some shareable examples then the author of ORT would be interested in those tricky cases. On Sunday, September 12, 2021 at 2:09:20 AM UTC+1 skybu...@hotmail.com wrote: > Problem description: > > Background: > Original fork does not want to split a file. > Child fork does want to split the file and does so. > Child fork can no longer benefit from changes from original fork. > > Problem: > Git is incapable of transferring the changes of orignal fork file to child > fork splitted files. > > Suggested Solution: > Use deep learning networks and machine learning to develop a neural brain > which is capable of detecting which changes/pieces of code belong together > and in what file they belong. > > Bye for now, > 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 git-users+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/git-users/146d706d-7f7c-402b-b4f4-5e722c9a7672n%40googlegroups.com.
