Dirk Behme wrote: > What's about this merge plan: > > 1) Take a local branch of recent DaVinci git > 2) Take a local branch of recent Tonys OMAP git. Should contain mainline > DaVinci stuff (?) > 3) (Manually) merge (2) on top to (1) > 3a) With merge conflicts in DaVinci only files, take the files from > Tony/mainline. Discard version in DaVinci git. > 3b) With merge conflicts in non-DaVinci files, resolve them manually as > appropriate > 4) Resolve compile and runtime errors introduced by (3) > 5) Create a patch of the changes between (1) and (after 4) and send to > list for review
I just discovered git-mergetool. I'm gonna give this merge a try this morning. Kevin _______________________________________________ Davinci-linux-open-source mailing list Davinci-linux-open-source@linux.davincidsp.com http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
