Skip to content

Commit 9bbffb6

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

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

.github/workflows/sync-main.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +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 config pull.rebase true
3433
git checkout -b sync-main-pr
3534
3635
echo "::group::Fetch"
3736
git pull origin sync-main-pr; exitCode=$?; if [ $exitCode -ne 0 ]; then exitCode=0; fi
38-
git pull --rebase origin main
37+
git pull origin main
3938
git push --force origin sync-main-pr
4039
echo "::endgroup::"
4140

0 commit comments

Comments
 (0)