Skip to content

Commit 695d9bb

Browse files
authored
Use -s ours and add --allow-unrelated-histories to sync workflow. (#214)
1 parent db747ab commit 695d9bb

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

.github/workflows/sync_main_latest.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
uses: actions/checkout@v4
1515

1616
- name: Merge main into latest
17-
run: git fetch && git switch latest && git merge origin/main
17+
run: git fetch && git switch latest && git merge -s ours origin/main --allow-unrelated-histories
1818

1919
- name: Create pull request
2020
id: cpr

0 commit comments

Comments
 (0)