Github user WillemJiang commented on the issue:
https://github.com/apache/incubator-rocketmq/pull/9
@dongeforever I had some trouble to resolve the rebase merge conflict just
by pulling the changes from your branch( it looks like there some patch are
already merged into the master branch). Can you rebase the master branch and
use squash[1] create a single commit for it.
[1]https://makandracards.com/makandra/527-squash-several-git-commits-into-a-single-commit
---
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.
---
