hopefully this will sort it
This commit is contained in:
parent
78e6bbc80f
commit
5ef777109e
|
@ -35,19 +35,6 @@ jobs:
|
||||||
converted from batch"
|
converted from batch"
|
||||||
git merge origin/master --strategy-option=ours --allow-unrelated
|
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
|
|
||||||
env:
|
|
||||||
CI_COMMIT_MESSAGE: Continuous Integration Build Artifacts
|
|
||||||
CI_COMMIT_AUTHOR: Continuous Integration
|
|
||||||
run: |
|
|
||||||
git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}"
|
|
||||||
git config --global user.email "username@users.noreply.github.com"
|
|
||||||
git checkout -b ${{ env.DEVELOPMENT_BRANCH }}
|
|
||||||
git add -A
|
|
||||||
git status
|
|
||||||
git commit -a -m "${{ env.CI_COMMIT_MESSAGE }} xml files converted to yml"
|
|
||||||
git push -f origin HEAD:${{ env.DEVELOPMENT_BRANCH }}
|
|
||||||
- name: make pull request
|
- name: make pull request
|
||||||
#git fetch
|
#git fetch
|
||||||
# git merge origin/master --allow-unrelated-histories --strategy-option=ours
|
# git merge origin/master --allow-unrelated-histories --strategy-option=ours
|
||||||
|
|
Loading…
Reference in New Issue