Change github to rebase not merge

atropos112 · May 28, 2024 · 9ad715e · 9ad715e
1 parent 11630cb
commit 9ad715e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.copier-answers.yml b/.copier-answers.yml
@@ -1,5 +1,5 @@
 # Changes here will be overwritten by Copier
-_commit: 0626df7
+_commit: a1c2d02
 _src_path: [email protected]:atropos112/template-python-pkg.git
 author: atropos
 email: [email protected]

diff --git a/.github/workflows/auto-merge.yaml b/.github/workflows/auto-merge.yaml
@@ -42,7 +42,7 @@ jobs:
 
       - name: Enable auto-merge for Dependabot PRs
         if: ${{ contains(github.event.pull_request.title, 'bump')}}
-        run: gh pr merge --auto --merge "$PR_URL"
+        run: gh pr merge --auto --rebase "$PR_URL"
         env:
           PR_URL: ${{github.event.pull_request.html_url}}
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN }}