Hey, As you have said, our commit history is indeed a little messy in some places especially regarding some duplicate commits.
We tried what you suggested to rebase it with git rebase -i , but our problem is that because -i ignores the merge commits, squashing and editing names make pretty much all the commits conflict. Even if we just run a git rebase -i and than do nothing it still gives merge conflicts (because the merges are omitted). I have read somewhere that I should try -i -p but typing "git rebase -i -p 3b88e30924268799c96317fe1bf9f5b9c6bf6f80" only shows the last 2 commits. Do you have any suggestions on this because trying to remerge all the 600 commits seems a little desperate? Regards, Gyula On Sun, Jul 13, 2014 at 5:25 PM, Stephan Ewen <se...@apache.org> wrote: > 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 > >
