We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent db747ab commit 695d9bbCopy full SHA for 695d9bb
.github/workflows/sync_main_latest.yml
@@ -14,7 +14,7 @@ jobs:
14
uses: actions/checkout@v4
15
16
- name: Merge main into latest
17
- run: git fetch && git switch latest && git merge origin/main
+ run: git fetch && git switch latest && git merge -s ours origin/main --allow-unrelated-histories
18
19
- name: Create pull request
20
id: cpr
0 commit comments