Update prod.sh

pmuir · Jun 25, 2016 · cebe3fb · cebe3fb
1 parent 9dc1b7b
commit cebe3fb
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/prod.sh b/prod.sh
@@ -15,7 +15,7 @@ git checkout $BRANCH &> $OUTPUT
 
 function build() {
   echo -e "### Updating git branch '$BRANCH'..."
-  git pull origin $BRANCH &> $OUTPUT 
+  git pull -x theirs origin $BRANCH &> $OUTPUT 
   SHA1="$(git log --pretty=format:'%h' -n 1)"
   echo -e "### Fetched revision $SHA1\n"