Skip to content
This repository was archived by the owner on Oct 11, 2025. It is now read-only.

Commit 844f14d

Browse files
authored
Update integrate_llvm.yml
1 parent ddb6e91 commit 844f14d

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

.github/workflows/integrate_llvm.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ jobs:
8383
8484
git config user.email "github-actions[bot]@users.noreply.github.com"
8585
git config user.name "github-actions[bot]"
86-
git pull /tmp/llvm-project main --rebase
86+
git pull /tmp/llvm-project main --no-rebase
8787
8888
- name: Generate token
8989
uses: actions/create-github-app-token@v1
@@ -111,7 +111,7 @@ jobs:
111111
with:
112112
token: ${{ steps.generate-token.outputs.token }}
113113
pull-request-number: ${{ steps.cpr.outputs.pull-request-number }}
114-
merge-method: merge
114+
merge-method: rebase
115115

116116
- name: Auto approve
117117
if: steps.cpr.outputs.pull-request-operation == 'created'

0 commit comments

Comments
 (0)