Skip to content

Commit

Permalink
fix release builder to be cool about this squash thing
Browse files Browse the repository at this point in the history
  • Loading branch information
Reed Allman committed Nov 3, 2016
1 parent 59ab9a2 commit 0e2c22f
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion build-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@ if [ -z "${GH_DEPLOY_USER}" ]; then
exit 1
fi

git fetch --all
git checkout master
git pull origin master
git reset --hard origin/master

# CircleCI has these set in the project
name=${GH_DEPLOY_USER}
Expand Down

1 comment on commit 0e2c22f

@tunezaq
Copy link

@tunezaq tunezaq commented on 0e2c22f Nov 4, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

git pull -f origin master would also work. You could even stop rebasing on master, now theres a silly idea :P

Please sign in to comment.