We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent c80cd88 commit 22e6a28Copy full SHA for 22e6a28
1 file changed
.github/workflows/CD_dev-release.yml
@@ -81,11 +81,11 @@ jobs:
81
82
git checkout dev-release
83
84
- git pull origin dev-release --rebase --autostash
+ git pull origin dev-release
85
86
87
88
- git merge -X theirs master-ci
+ git merge -X theirs origin/master-ci
89
90
rm -rf LICENSE
91
rm -rf README.md
@@ -96,7 +96,7 @@ jobs:
96
git add .
97
98
git diff-index --quiet HEAD || git commit -m "Sanitize dev-release"
99
- git push origin dev-release --force
+ git push origin dev-release
100
101
- name: Webhook
102
uses: distributhor/workflow-webhook@v3
0 commit comments