Skip to content

Commit

Permalink
Update ci config to merge dev to published as a fast-forward if possible
Browse files Browse the repository at this point in the history
  • Loading branch information
bpringe committed Feb 10, 2021
1 parent 9116f36 commit 8f56c0a
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -263,8 +263,7 @@ jobs:
git config --global user.name $GITHUB_USER_NAME
git checkout published
git merge origin/dev
git log -2
# git push origin HEAD
git push origin HEAD
deploy-docs:
docker:
- image: cimg/python:3.8-node
Expand Down

0 comments on commit 8f56c0a

Please sign in to comment.