Skip to content

Commit 920a192

Browse files
authored
Update deploy_to_private.yaml
1 parent e4bec17 commit 920a192

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

.github/workflows/deploy_to_private.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,11 @@ jobs:
4747
- name: Update deployment with secondary main
4848
run: |
4949
git fetch ssh-origin main
50+
- name: reb
51+
run: |
5052
git rebase -X ours ssh-origin/main
53+
- name: merge
54+
run: |
5155
git merge --squash -X theirs origin/main --allow-unrelated-histories
5256
5357
- name: Update deployment branch with local main

0 commit comments

Comments
 (0)