Github user Degreane commented on the pull request:
https://github.com/apache/trafficserver/pull/53#issuecomment-40650993
Hi
Previously the patch would just install with no problems
but today i was trying to pull it in latest ATS git clone i got the stuff
below
would it be fixed so we may be able to use it again ?
<code>
git pull https://github.com/yzlai/trafficserver TS-2604
remote: Counting objects: 24, done.
remote: Compressing objects: 100% (21/21), done.
remote: Total 24 (delta 7), reused 15 (delta 3)
Unpacking objects: 100% (24/24), done.
From https://github.com/yzlai/trafficserver
* branch TS-2604 -> FETCH_HEAD
Auto-merging plugins/experimental/Makefile.am
Auto-merging configure.ac
CONFLICT (content): Merge conflict in configure.ac
Automatic merge failed; fix conflicts and then commit the result.
</code>
Much Regards
---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
