Skip to content

Commit 2cc47d6

Browse files
authored
Fix sync_main_to_latest workflow (#206)
* Fix sync_to_main workflow to fetch branches before merging main to latest. Git fetch. Merge origin main * Remove test branch.
1 parent 2ffbaa8 commit 2cc47d6

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

.github/workflows/sync_main_latest.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
name: Sync main and latest
22
on:
3+
workflow_dispatch:
34
push:
45
branches:
56
- main
@@ -13,7 +14,7 @@ jobs:
1314
uses: actions/checkout@v3
1415

1516
- name: Merge main into latest
16-
run: git checkout latest && git merge main
17+
run: git fetch && git switch latest && git merge origin/main
1718

1819
- name: Create pull request
1920
id: cpr

0 commit comments

Comments
 (0)