Skip to content

Commit 1cecfbb

Browse files
committed
fix(deploy): do not merge branches into master when pushing back skell
1 parent 05dd3c6 commit 1cecfbb

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

.circleci/config.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,8 @@ jobs:
169169
command: |
170170
git config user.email "${GITHUB_EMAIL}"
171171
git config user.name "CircleCI Deploy"
172-
git checkout -f master
172+
git fetch origin
173+
git checkout -f origin/master
173174
cp /tmp/resources/templateflow-skel.zip templateflow/conf/
174175
git add templateflow/conf/templateflow-skel.zip
175176
git commit -m "rel(${CIRCLE_TAG}): Update S3 skeleton file [skip ci]"

0 commit comments

Comments
 (0)