Github user mxm commented on the pull request:
https://github.com/apache/flink/pull/934#issuecomment-136774275
`git merge-base master framesize_fix` should show you the commit the
branches diverged. Depending on the outcome, you might have to go back to an
earlier version of your changes and rebase those against the master. It might
be easier to squash all your commits before rebasing.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
