Github user stain commented on the pull request:
https://github.com/apache/incubator-taverna-language/pull/2#issuecomment-112598857
Could you resolve the merge conflict first? You will need to do something
like:
```
git remote add upstream
https://github.com/apache/incubator-taverna-language.git
git fetch upstream
git merge upstream/master
# vim whatever-is-in-conflict
git commit
mvn clean install # does it still build?
git push
```
---
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.
---
