Github user blrunner commented on the pull request:
https://github.com/apache/tajo/pull/497#issuecomment-94344773
I failed to merge this from the master branch as follows.
```
Auto-merging tajo-storage/pom.xml
Auto-merging tajo-project/pom.xml
Auto-merging tajo-core/pom.xml
CONFLICT (content): Merge conflict in tajo-core/pom.xml
Auto-merging
tajo-catalog/tajo-catalog-common/src/main/proto/CatalogProtos.proto
Auto-merging
tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/CatalogUtil.java
Automatic merge failed; fix conflicts and then commit the result.
```
Could you rebase this again?
---
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.
---
