From 56820d6c55348db4640d4e7221b42816c8d897a1 Mon Sep 17 00:00:00 2001 From: Akira Komamura Date: Thu, 2 Nov 2023 23:14:03 +0900 Subject: [PATCH] Make the head based on akirak --- .github/workflows/merge-upstream.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/merge-upstream.yml b/.github/workflows/merge-upstream.yml index 67b5856f981..36c98838cf8 100644 --- 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: