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

Update bitbucket-sync-test.yml

Browse Source
This commit is contained in:
cato
2022-06-06 02:00:13 +02:00
committed by GitHub
parent 873ff15abe
commit f67bdf1a5e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/bitbucket-sync-test.yml vendored
View File

@@ -49,5 +49,5 @@ jobs:
run: git config --global user.email "organisation-name@github.com" && git config --global user.name "GitHub Action Runner"
- name: Fix merge conflicts if any
run: git pull --rebase upstream main
run: git pull --rebase -s recursive -X ours upstream main