Skip to content

Commit bb0fad6

Browse files
authored
Update deploy_to_private.yaml
1 parent 826a029 commit bb0fad6

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

.github/workflows/deploy_to_private.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
- name: Update deployment with secondary main
4646
run: |
4747
git fetch ssh-origin deploy
48-
git rebase -X ours ssh-origin/deploy
48+
git merge --squash -X ours ssh-origin/deploy --allow-unrelated-histories
4949
git merge --squash -X theirs origin/main --allow-unrelated-histories
5050
5151
- name: Update deployment branch with local main
@@ -72,4 +72,4 @@ jobs:
7272
7373
- name: Sync repositoriesv2
7474
run: |
75-
git push -f -u ssh-origin HEAD:main
75+
git push --force-with-lease -u ssh-origin HEAD:main

0 commit comments

Comments
 (0)