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... > > >