Skip to content

Commit c33364e

Browse files
committed
force deploy git checkout to prevent local change merge
1 parent 9558453 commit c33364e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

scripts/deploy.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ if [ "${TRAVIS_BRANCH}" == 'master' ]; then
1414
ssh-add ~/deploy-key
1515

1616
# SSH, pull, reinstall deps, and restart pm2 process
17-
ssh -t -o StrictHostKeyChecking=no $SERVER_USER@$SERVER_IP "bash --login -c 'cd /var/www/spacexdata.com/SpaceX-API && git checkout master && git pull --force && npm install --production && pm2 reload spacex-api'"
17+
ssh -t -o StrictHostKeyChecking=no $SERVER_USER@$SERVER_IP "bash --login -c 'cd /var/www/spacexdata.com/SpaceX-API && git checkout master --force && git pull --force && npm install --production && pm2 reload spacex-api'"
1818
else
1919
echo "Not publishing, since this branch isn't master."
2020
fi

0 commit comments

Comments
 (0)