Skip to content
This repository has been archived by the owner on Apr 30, 2018. It is now read-only.

Commit

Permalink
fix(build): I hope nobody's watching... 😓 #455
Browse files Browse the repository at this point in the history
  • Loading branch information
Kent C. Dodds committed Sep 7, 2015
1 parent f53f20a commit e2577f4
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions scripts/publish-latest.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ git remote set-url origin https://formly-bot:$BOT_GH_TOKEN@github.com/formly-js/

echo "checking out latest"
git remote update
git fetch
git checkout -t -b latest origin/latest
git fetch origin
git checkout --track origin/latest

echo "merging master"
git merge origin/master -m "master merge" -X theirs
Expand Down

0 comments on commit e2577f4

Please sign in to comment.