Lets see if the variant with rewriting the history using git filter-branch works better.
One other thing regarding the merge: I'm not sure if we have to do any legal checks prior to merging the changes into our project. Maybe we even need a SGA or CCLA if the code has been written as part of an employment. We certainly need to check the dependencies for incompatible licenses. On Sun, Jul 13, 2014 at 4:16 PM, Stephan Ewen <se...@apache.org> wrote: > Okay, here is a try: > > https://github.com/StephanEwen/incubator-flink/tree/streaming/flink-addons/flink-streaming > > It attributes all files to my commit, but it preseves all authors in git > blame. It is a bit strange, the history is broken, but some author > information is preserved. > > Not ideal. Hope we can do better... > > > > On Sun, Jul 13, 2014 at 3:52 PM, Márton Balassi <balassi.mar...@gmail.com> > wrote: > > > Let us know if we can assist the merge in any way. > > > > > > On Sun, Jul 13, 2014 at 3:50 PM, Stephan Ewen <se...@apache.org> wrote: > > > > > Okay. How do we do this, because it is cross-repository merge? I'll > look > > > into Robert's referene... > > > > > >
