Github user isper3at commented on the issue:
https://github.com/apache/incubator-rya/pull/245
the complexity of the changes shouldn't matter to git, I was able to
squash all the commits into 1 with no conflicts. I am still seeing compile
errors in GeoFunctionsIT---
