Skip to content

Commit eb41d97

Browse files
authored
Update sync-main.yml
1 parent 9bbffb6 commit eb41d97

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

.github/workflows/sync-main.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,11 @@ jobs:
3030
run: |
3131
git config user.name "github-actions[bot]"
3232
git config user.email "github-actions[bot]@users.noreply.github.com"
33-
git checkout -b sync-main-pr
33+
git checkout -B sync-main-pr origin/sync-main-pr
3434
3535
echo "::group::Fetch"
3636
git pull origin sync-main-pr; exitCode=$?; if [ $exitCode -ne 0 ]; then exitCode=0; fi
37+
git config pull.rebase true
3738
git pull origin main
3839
git push --force origin sync-main-pr
3940
echo "::endgroup::"

0 commit comments

Comments
 (0)