Hi everyone! I have found a way to add the code into the main repository in a different branch, preserving all history. All code is rewritten (with history) to be in "flink-addons/flink-streaming" and the commits are prefixed with [streaming]. https://github.com/StephanEwen/incubator-flink/commits/streaming
What we can now do is rebase the branch on top of master and then just add the commits. For that, I would like to ask for your help: The commit history is a bit messy, to be honest. A lot of stuff is in multiple commits with identical messages. Some commits are called "whatever". Can you clean up the commit history a bit by doing a "git rebase -i 3b88e30924268799c96317fe1bf9f5b9c6bf6f80" and squash some commits. I think then we are good to do a merge. Greetings, Stephan