Skip to content

Commit bfd6310

Browse files
committed
setup merging strategy
1 parent 111855d commit bfd6310

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

.github/workflows/build-check-install.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -542,6 +542,7 @@ jobs:
542542
test_dir="tests/testthat/"
543543
git branch
544544
git remote -v
545+
git config pull.rebase true
545546
remote_repo="https://${GITHUB_ACTOR}:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}.git"
546547
git pull "$remote_repo" main
547548
git branch

0 commit comments

Comments
 (0)