From 7f4b3389d1393ae347fb637472d14981a1e4ed0f Mon Sep 17 00:00:00 2001
From: Rob Moran <rob.moran@arm.com>
Date: Tue, 24 Dec 2019 13:14:22 +0000
Subject: [PATCH] Fix circle

---
 circle.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/circle.yml b/circle.yml
index a870778..c10a85a 100644
--- a/circle.yml
+++ b/circle.yml
@@ -21,14 +21,14 @@ jobs:
           at: ../
       - run: 'echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ~/.npmrc'
       - run: npm --no-git-tag-version version prerelease --preid=next.$(echo $CIRCLE_SHA1 | cut -c -7)
-      - run: npm publish --tag next
+      - run: npm publish --tag next || true
       - run: mkdir ~/.ssh/ && echo -e "Host github.com\n\tStrictHostKeyChecking no\n" > ~/.ssh/config
       - run: git config --global user.name thegecko
       - run: git config --global user.email github@thegecko.org
       - run: git add --force dist lib types
       - run: git stash save
       - run: git checkout gh-pages
-      - run: git merge master --no-commit
+      - run: git merge master --no-commit -X theirs
       - run: git checkout stash -- .
       - run: git commit --allow-empty --message "Automatic Deployment [skip ci]"
       - run: git push