cato447/EIST-Teamprojekt
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update bitbucket-sync.yml

Browse Source
This commit is contained in:
cato
2022-06-06 01:42:04 +02:00
committed by GitHub
parent 2167298da1
commit f46f38e045
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/bitbucket-sync.yml vendored
View File

@@ -49,7 +49,9 @@ jobs:
run: git config --global user.email "organisation-name@github.com" && git config --global user.name "GitHub Action Runner" run: git config --global user.email "organisation-name@github.com" && git config --global user.name "GitHub Action Runner"
- name: Fix merge conflicts if any - name: Fix merge conflicts if any
run: git pull -X ours run: |
git checkout --ours .
git add .
- name: Git push to other repo - name: Git push to other repo
run: git push upstream run: git push upstream