Github user dongeforever commented on the issue:
https://github.com/apache/incubator-rocketmq/pull/9
@WillemJiang the conflicts were resolved. And I tried squashing the
commits, but it seemed does not work for the master branch because i had
already pushed it to my 'origin' repository. Maybe you can close this PR, and i
create a new one using a fresh branch.
---
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.
---
