Github user revans2 commented on the pull request:
https://github.com/apache/storm/pull/694#issuecomment-144066244
@mjsax the issue is with how you upmerge. If you just do a git merge or a
git pull github can become confused because it thinks you are still based off
of the original commit, and will include the commits from the upmerge.
Alternatively you could do a git rebase and rebase all of your changes on a
new version, instead of merging in the new version. This will clean it up, but
before you do this please make sure you have a backup of your changes, and it
does a destructive write that can, and I have had this personally happen to me,
delete all of your code. When you are pushing to the github repo you will have
to include a -f because git by default does not like destructive writes and you
have to force it to do them.
---
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.
---
