From 63fcd6c089bb772b1ae2b9da24c9406c9e579c61 Mon Sep 17 00:00:00 2001
From: Akira Komamura <akira.komamura@gmail.com>
Date: Thu, 2 Nov 2023 23:58:36 +0900
Subject: [PATCH] squash! Don't use the Nix flake

---
 .github/workflows/merge-upstream.yml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/merge-upstream.yml b/.github/workflows/merge-upstream.yml
index c4dadd335b0..7e3225cfc6c 100644
--- a/.github/workflows/merge-upstream.yml
+++ b/.github/workflows/merge-upstream.yml
@@ -59,16 +59,20 @@ jobs:
             commit.committer_date = commit.author_date
           ' --force
 
+    - name: Rebase
+      run: |
+        git rebase -s ours --onto=merge-base ${{ steps.start.outputs.rev }}
+
     # A workaround to prevent peter-evans/create-pull-request from resetting the
     # head here:
     # <https://github.com/peter-evans/create-pull-request/blob/d806186ee3288c60a352af9852b6b18afbbfd87e/src/create-or-update-branch.ts#L178>
-    - name: Detach the head
-      run: git switch --detach `git rev-parse HEAD`
+    # - name: Detach the head
+    #   run: git switch --detach `git rev-parse HEAD`
 
     - name: Create a pull request
       uses: peter-evans/create-pull-request@v5
       with:
-        base: merge-base
+        # base: merge-base
         token: ${{ secrets.PAT_FOR_PR }}
         title: 'Merge the upstream recipe commits'
         branch: upstream-recipes