We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent e8e12b4 commit 178476aCopy full SHA for 178476a
.github/workflows/sync-upstream.yml
@@ -31,7 +31,7 @@ jobs:
31
32
- name: Sync main branch
33
run: |
34
- git checkout main
+ git checkout origin/main -B main
35
git merge upstream/main --no-edit || {
36
echo "Merge conflict detected on main branch"
37
git merge --abort
@@ -47,7 +47,7 @@ jobs:
47
48
- name: Sync dev branch
49
50
- git checkout dev
+ git checkout origin/dev -B dev
51
git merge upstream/dev --no-edit || {
52
echo "Merge conflict detected on dev branch"
53
0 commit comments