We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent c8efdb1 commit ddd6936Copy full SHA for ddd6936
.github/workflows/sync-upstream.yaml
@@ -30,7 +30,7 @@ jobs:
30
- name: Merge upstream
31
run: |
32
git checkout main
33
- git merge --no-edit upstream/main
+ git merge --no-edit --allow-unrelated-histories upstream/main
34
35
- name: Push changes
36
0 commit comments