metron-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ottobackwards <...@git.apache.org>
Subject [GitHub] metron issue #628: METRON-1011 Enforce submission of 4 params Stellar ENRICH...
Date Tue, 04 Jul 2017 13:07:35 GMT
Github user ottobackwards commented on the issue:

    https://github.com/apache/metron/pull/628
  
    Yes.  Another PR was merged into master, and this PR refactored Stellar greatly.  This
has introduced conflict with your changes ( they made change and you made changes etc ).
    
    You need to resolve the conflicts and push the result to your github 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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

Mime
View raw message