Skip to content

Commit 0ba8690

Browse files
Merge 22e6a28 into master-ci
2 parents 8560be0 + 22e6a28 commit 0ba8690

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

.github/workflows/CD_dev-release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,11 @@ jobs:
8181
8282
git checkout dev-release
8383
84-
git pull origin dev-release --rebase --autostash
84+
git pull origin dev-release
8585
8686
git checkout dev-release
8787
88-
git merge -X theirs master-ci
88+
git merge -X theirs origin/master-ci
8989
9090
rm -rf LICENSE
9191
rm -rf README.md
@@ -96,7 +96,7 @@ jobs:
9696
git add .
9797
9898
git diff-index --quiet HEAD || git commit -m "Sanitize dev-release"
99-
git push origin dev-release --force
99+
git push origin dev-release
100100
101101
- name: Webhook
102102
uses: distributhor/workflow-webhook@v3

0 commit comments

Comments
 (0)