From 4edf692962fe9f9236a2ccc100f7bb2d0e2ff2a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aliz=C3=A9=20Debray?= Date: Wed, 16 Oct 2024 17:58:25 +0200 Subject: [PATCH] Update create-token-pr.yaml --- .github/workflows/create-token-pr.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/create-token-pr.yaml b/.github/workflows/create-token-pr.yaml index 1d326740df..a8835aadb6 100644 --- a/.github/workflows/create-token-pr.yaml +++ b/.github/workflows/create-token-pr.yaml @@ -18,6 +18,8 @@ jobs: # Checkout the token branch which was pushed - name: Checkout Token Branch uses: actions/checkout@v4 + with: + ref: ${{ github.ref_name }} # Check if the PR branch corresponding to the token branch exists - name: Get PR Branch @@ -44,7 +46,6 @@ jobs: run: | git config user.name "Swiss Post Bot" git config user.email "103635272+swisspost-bot@users.noreply.github.com" - git fetch origin ${{ github.ref_name }} git merge ${{ github.ref_name }} -X theirs --no-edit git push origin ${{ steps.pr-branch.outputs.name }} env: