From bced355191ab3c9f9b0383e0f9e6c67cda535a6a Mon Sep 17 00:00:00 2001
From: wing328 <wing328hk@gmail.com>
Date: Thu, 29 Jun 2017 13:01:40 +0800
Subject: [PATCH] better detection for unresolved merge conflicts

---
 .travis.yml                        |  9 ++++++---
 bin/utils/detect_merge_conflict.sh | 17 +++++++++++++++++
 2 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100755 bin/utils/detect_merge_conflict.sh

diff --git a/.travis.yml b/.travis.yml
index 5694414f3ec..6196982e339 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -88,19 +88,22 @@ script:
   - set -e
   # fail if templates/generators contain carriage return '\r'
   - /bin/bash ./bin/utils/detect_carriage_return.sh
+  # fail if generators contain merge conflicts
+  - /bin/bash ./bin/utils/detect_merge_conflict.sh
   # fail if generators contain tab '\t'
   - /bin/bash ./bin/utils/detect_tab_in_java_class.sh
   # run integration tests defined in maven pom.xml
   - mvn -q --batch-mode verify -Psamples
+### docker-related tasks have been moved to CircleCI
   # docker: build generator image and push to Docker Hub
   #- if [ $DOCKER_HUB_USERNAME ]; then docker login --email=$DOCKER_HUB_EMAIL --username=$DOCKER_HUB_USERNAME --password=$DOCKER_HUB_PASSWORD && docker build -t $DOCKER_GENERATOR_IMAGE_NAME ./modules/swagger-generator && if [ ! -z "$TRAVIS_TAG" ]; then docker tag $DOCKER_GENERATOR_IMAGE_NAME:latest $DOCKER_GENERATOR_IMAGE_NAME:$TRAVIS_TAG; fi && if [ ! -z "$TRAVIS_TAG" ] || [ "$TRAVIS_BRANCH" = "master" ]; then docker push $DOCKER_GENERATOR_IMAGE_NAME; fi; fi
   ## docker: build cli image and push to Docker Hub
   #- if [ $DOCKER_HUB_USERNAME ]; then docker login --email=$DOCKER_HUB_EMAIL --username=$DOCKER_HUB_USERNAME --password=$DOCKER_HUB_PASSWORD && docker build -t $DOCKER_CODEGEN_CLI_IMAGE_NAME ./modules/swagger-codegen-cli && if [ ! -z "$TRAVIS_TAG" ]; then docker tag $DOCKER_CODEGEN_CLI_IMAGE_NAME:latest $DOCKER_CODEGEN_CLI_IMAGE_NAME:$TRAVIS_TAG; fi && if [ ! -z "$TRAVIS_TAG" ] || [ "$TRAVIS_BRANCH" = "master" ]; then docker push $DOCKER_CODEGEN_CLI_IMAGE_NAME; fi; fi
-
-env:
-  - DOCKER_GENERATOR_IMAGE_NAME=swaggerapi/swagger-generator DOCKER_CODEGEN_CLI_IMAGE_NAME=swaggerapi/swagger-codegen-cli
+#env:
+#  - DOCKER_GENERATOR_IMAGE_NAME=swaggerapi/swagger-generator DOCKER_CODEGEN_CLI_IMAGE_NAME=swaggerapi/swagger-codegen-cli
 
 after_success:
+  # push a snapshot version to maven repo
   - if [ $SONATYPE_USERNAME ] && [ -z $TRAVIS_TAG ] && [ $TRAVIS_PULL_REQUEST == false ]; then
       mvn clean deploy --settings .travis/settings.xml;
     fi;
diff --git a/bin/utils/detect_merge_conflict.sh b/bin/utils/detect_merge_conflict.sh
new file mode 100755
index 00000000000..520c9d5c060
--- /dev/null
+++ b/bin/utils/detect_merge_conflict.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# grep for '<<<<<<< HEAD' in swagger codegen
+grep -RUIl '<<<<<<< HEAD' modules/swagger-codegen/src
+
+if [ $? -ne 1 ]; then
+    echo "modules/swagger-codegen/src contain merge conflicts '<<<<<<< HEAD'. Please remove it and try again."
+    exit 1;
+fi
+
+# grep for '<<<<<<< HEAD' in the samples
+grep -RUIl '<<<<<<< HEAD' samples/
+
+if [ $? -ne 1 ]; then
+    echo "samples/ contain merge conflicts '<<<<<<< HEAD'. Please remove it and try again."
+    exit 1;
+fi