Github user PSUdaemon commented on the issue:
https://github.com/apache/trafficserver/pull/763
Yes, merge and mark what files you resolved conflicts in. Git normally puts
this in the commented part of the commit message so just make sure you
uncomment before 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.
---
