From 9121da3b80fbe4d6a1133b1e6d8aed3ee71b8ed2 Mon Sep 17 00:00:00 2001 From: Kristofer Date: Thu, 9 Jan 2025 10:57:49 +0000 Subject: [PATCH] checkout, but preserve local changes --- .github/workflows/pullrequest.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml index b5c2f689f36f..43eb515bece7 100644 --- a/.github/workflows/pullrequest.yml +++ b/.github/workflows/pullrequest.yml @@ -70,9 +70,9 @@ jobs: set -euo pipefail set -x - git checkout -f "$GITHUB_HEAD_REF" - git checkout -f "$GITHUB_BASE_REF" - git checkout -f "$GITHUB_SHA" + git checkout -m "$GITHUB_HEAD_REF" + git checkout -m "$GITHUB_BASE_REF" + git checkout -m "$GITHUB_SHA" git config --global user.email "ci@island.is" git config --global user.name "CI Bot"