Update bitbucket-sync.yml
This commit is contained in:
2
.github/workflows/bitbucket-sync.yml
vendored
2
.github/workflows/bitbucket-sync.yml
vendored
@@ -50,7 +50,7 @@ jobs:
|
|||||||
|
|
||||||
- name: Fix merge conflicts if any
|
- name: Fix merge conflicts if any
|
||||||
run: |
|
run: |
|
||||||
git checkout --ours .
|
git checkout --theirs .
|
||||||
git add .
|
git add .
|
||||||
|
|
||||||
- name: Git push to other repo
|
- name: Git push to other repo
|
||||||
|
|||||||
Reference in New Issue
Block a user