We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent 826a029 commit bb0fad6Copy full SHA for bb0fad6
1 file changed
.github/workflows/deploy_to_private.yaml
@@ -45,7 +45,7 @@ jobs:
45
- name: Update deployment with secondary main
46
run: |
47
git fetch ssh-origin deploy
48
- git rebase -X ours ssh-origin/deploy
+ git merge --squash -X ours ssh-origin/deploy --allow-unrelated-histories
49
git merge --squash -X theirs origin/main --allow-unrelated-histories
50
51
- name: Update deployment branch with local main
@@ -72,4 +72,4 @@ jobs:
72
73
- name: Sync repositoriesv2
74
75
- git push -f -u ssh-origin HEAD:main
+ git push --force-with-lease -u ssh-origin HEAD:main
0 commit comments