Github user shroman commented on the issue:
https://github.com/apache/incubator-rocketmq/pull/3
@lollipopjin I resolved the conflicts, now you can review.
How about squashing all commits when you merge after reviewing this issue?
My concern is -- I merged this to the master, so if I squash, it will be very
hard for you to review.
---
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.
---
