Skip to content

Commit ddd6936

Browse files
authored
Update sync-upstream.yaml
1 parent c8efdb1 commit ddd6936

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

.github/workflows/sync-upstream.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- name: Merge upstream
3131
run: |
3232
git checkout main
33-
git merge --no-edit upstream/main
33+
git merge --no-edit --allow-unrelated-histories upstream/main
3434
3535
- name: Push changes
3636
run: |

0 commit comments

Comments
 (0)