Github user djay87 commented on the issue:
https://github.com/apache/incubator-ariatosca/pull/186
Hi Max,
Finally i was able to squash all the commits and resolve the merge issue
with a single commit. Kindly check and let me know if its fine this time :)
---
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.
---
