hopefully this will sort it
This commit is contained in:
parent
f4a11ec9cd
commit
78e6bbc80f
|
@ -33,7 +33,7 @@ jobs:
|
||||||
git commit -m "${{ env.CI_COMMIT_MESSAGE }}
|
git commit -m "${{ env.CI_COMMIT_MESSAGE }}
|
||||||
|
|
||||||
converted from batch"
|
converted from batch"
|
||||||
git merge origin/master --strategy-option=ours
|
git merge origin/master --strategy-option=ours --allow-unrelated
|
||||||
git push -f origin HEAD:${{ env.DEVELOPMENT_BRANCH }}
|
git push -f origin HEAD:${{ env.DEVELOPMENT_BRANCH }}
|
||||||
|
|
||||||
- name: GIT commit and push all changed files
|
- name: GIT commit and push all changed files
|
||||||
|
|
Loading…
Reference in New Issue