FailedConsole Output

Started by an SCM change
Checkout:workspace / /home/hudson/genie.geotrellis/.hudson/jobs/geotrellis-publish-pointcloud-milestone/workspace - hudson.remoting.LocalChannel@532ae29e
Using strategy: Default
Git Exe: git
Last Built Revision: Revision e5ddd78585fd23783a60ca02676b975a55507b30 (origin/master)
Checkout:workspace / /home/hudson/genie.geotrellis/.hudson/jobs/geotrellis-publish-pointcloud-milestone/workspace - hudson.remoting.LocalChannel@532ae29e
Fetching changes from the remote Git repository
Fetching upstream changes from https://github.com/locationtech/geotrellis
Commencing build of Revision 7c2e01fc0048fce403173fd850b868e6d1af9d59 (origin/master)
Checking out Revision 7c2e01fc0048fce403173fd850b868e6d1af9d59 (origin/master)
[workspace] $ /bin/sh -xe /tmp/hudson4840534492231531039.sh
+ git checkout milestone/pointcloud
Previous HEAD position was 7c2e01f... Use Scaffeine instead of LRU cache
Switched to branch 'milestone/pointcloud'
Your branch and 'origin/milestone/pointcloud' have diverged,
and have 22 and 715 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)
+ git merge origin/milestone/pointcloud
Auto-merging vector/src/main/scala/geotrellis/vector/triangulation/TriangleMap.scala
CONFLICT (content): Merge conflict in vector/src/main/scala/geotrellis/vector/triangulation/TriangleMap.scala
CONFLICT (modify/delete): vector/src/main/scala/geotrellis/vector/triangulation/Predicates.scala deleted in origin/milestone/pointcloud and modified in HEAD. Version HEAD of vector/src/main/scala/geotrellis/vector/triangulation/Predicates.scala left in tree.
Removing vector/src/main/scala/geotrellis/vector/triangulation/HalfEdgeTable.scala
Auto-merging vector/src/main/scala/geotrellis/vector/triangulation/DelaunayTriangulation.scala
CONFLICT (content): Merge conflict in vector/src/main/scala/geotrellis/vector/triangulation/DelaunayTriangulation.scala
Auto-merging vector/src/main/scala/geotrellis/vector/triangulation/DelaunayStitcher.scala
CONFLICT (content): Merge conflict in vector/src/main/scala/geotrellis/vector/triangulation/DelaunayStitcher.scala
Auto-merging vector/src/main/scala/geotrellis/vector/triangulation/DelaunayPointSet.scala
CONFLICT (content): Merge conflict in vector/src/main/scala/geotrellis/vector/triangulation/DelaunayPointSet.scala
Auto-merging vector/src/main/scala/geotrellis/vector/mesh/HalfEdge.scala
Auto-merging vector/src/main/java/geotrellis/vector/ShewchuksDeterminant.java
Auto-merging vector-test/src/test/scala/spec/geotrellis/vector/triangulation/DelaunayTriangulationSpec.scala
CONFLICT (content): Merge conflict in vector-test/src/test/scala/spec/geotrellis/vector/triangulation/DelaunayTriangulationSpec.scala
Auto-merging spark/src/main/scala/geotrellis/spark/io/ValueReaderProvider.scala
Auto-merging spark/src/main/scala/geotrellis/spark/io/AttributeStoreProvider.scala
Auto-merging spark-testkit/src/main/scala/geotrellis/spark/testkit/TestEnvironment.scala
Auto-merging spark-testkit/src/main/scala/geotrellis/spark/testkit/OpAsserter.scala
Auto-merging raster/src/main/scala/geotrellis/raster/triangulation/DelaunayRasterizer.scala
CONFLICT (content): Merge conflict in raster/src/main/scala/geotrellis/raster/triangulation/DelaunayRasterizer.scala
Removing raster/src/main/scala/geotrellis/raster/io/geotiff/Intersection.scala
CONFLICT (modify/delete): pointcloud/src/test/scala/geotrellis/pointcloud/spark/triangulation/StitchedDelaunaySpec.scala deleted in origin/milestone/pointcloud and modified in HEAD. Version HEAD of pointcloud/src/test/scala/geotrellis/pointcloud/spark/triangulation/StitchedDelaunaySpec.scala left in tree.
CONFLICT (modify/delete): pointcloud/src/test/scala/geotrellis/pointcloud/spark/triangulation/BoundaryDelaunaySpec.scala deleted in origin/milestone/pointcloud and modified in HEAD. Version HEAD of pointcloud/src/test/scala/geotrellis/pointcloud/spark/triangulation/BoundaryDelaunaySpec.scala left in tree.
Auto-merging pointcloud/src/main/scala/geotrellis/pointcloud/spark/triangulation/TinToDem.scala
CONFLICT (content): Merge conflict in pointcloud/src/main/scala/geotrellis/pointcloud/spark/triangulation/TinToDem.scala
CONFLICT (modify/delete): pointcloud/src/main/scala/geotrellis/pointcloud/spark/triangulation/StitchedDelaunay.scala deleted in origin/milestone/pointcloud and modified in HEAD. Version HEAD of pointcloud/src/main/scala/geotrellis/pointcloud/spark/triangulation/StitchedDelaunay.scala left in tree.
Removing pointcloud/src/main/scala/geotrellis/pointcloud/spark/triangulation/CoordinatePredicates.scala
CONFLICT (modify/delete): pointcloud/src/main/scala/geotrellis/pointcloud/spark/triangulation/BoundaryDelaunay.scala deleted in origin/milestone/pointcloud and modified in HEAD. Version HEAD of pointcloud/src/main/scala/geotrellis/pointcloud/spark/triangulation/BoundaryDelaunay.scala left in tree.
Removing pointcloud/src/main/scala/geotrellis/pointcloud/pipeline/package.scala
Removing pointcloud/src/main/scala/geotrellis/pointcloud/pipeline/json/Implicits.scala
Removing pointcloud/src/main/scala/geotrellis/pointcloud/pipeline/WriterTypes.scala
Removing pointcloud/src/main/scala/geotrellis/pointcloud/pipeline/ReaderTypes.scala
Removing pointcloud/src/main/scala/geotrellis/pointcloud/pipeline/PipelineExpressions.scala
Removing pointcloud/src/main/scala/geotrellis/pointcloud/pipeline/FilterTypes.scala
Removing mkdocs.yml
Removing docs/tutorials/setup.md
Removing docs/tutorials/reading-geoTiffs.md
Removing docs/tutorials/quickstart.md
Removing docs/tutorials/kernel-density.md
Removing docs/tutorials/etl-tutorial.md
Removing docs/setup.md
Removing docs/index.md
Removing docs/guide/vectors.md
Removing docs/guide/vector-backends.md
Removing docs/guide/tile-backends.md
Removing docs/guide/spark.md
Removing docs/guide/rasters.md
Removing docs/guide/module-hierarchy.md
Removing docs/guide/faq.md
Removing docs/guide/extending-geotrellis.md
Removing docs/guide/etl.md
Removing docs/guide/core-concepts.md
Removing docs/contributing.md
Removing docs/architecture/proj4-implementation.md
Removing docs/architecture/high-performance-scala.md
Removing docs/architecture/adr.md
Removing docs/CHANGELOG.md
Auto-merging CONTRIBUTING.md
Auto-merging .locationtech/deploy.sh
Automatic merge failed; fix conflicts and then commit the result.
Sending e-mails to: remanuele@azavea.com gr.pomadchin@gmail.com cwoodbury@azavea.com
Finished: FAILURE