Make the head based on akirak

akirak · Nov 2, 2023 · 56820d6 · 56820d6
1 parent 84f9fe7
commit 56820d6
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.github/workflows/merge-upstream.yml b/.github/workflows/merge-upstream.yml
@@ -37,6 +37,7 @@ jobs:
         git config --add user.email '6270544+github-actions[bot]@users.noreply.github.com'
         nix run github:emacs-twist/recipes-updater/remain-on-tmp-branch#forceUpdate \
           --no-write-lock-file -- upstream/master
+        git rebase akirak
 
     # A workaround to prevent peter-evans/create-pull-request from resetting the
     # head here: