From 715824cdb3148d87a55c5fee41ad98b7a99df680 Mon Sep 17 00:00:00 2001
From: Jakub Tobiasz <jakub.tobiasz@icloud.com>
Date: Wed, 21 Jun 2023 12:57:13 +0200
Subject: [PATCH] Fix auto upmerge workflow

---
 .github/workflows/upmerge_pr.yaml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/upmerge_pr.yaml b/.github/workflows/upmerge_pr.yaml
index 57035edcd33..533aa3cd94c 100644
--- a/.github/workflows/upmerge_pr.yaml
+++ b/.github/workflows/upmerge_pr.yaml
@@ -24,13 +24,13 @@ jobs:
             -
                 uses: actions/checkout@v3
                 with:
-                    ref: ${{ matrix.base_branch }}
+                    ref: ${{ matrix.target_branch }}
 
-            -
-                name: Setup PHP
-                uses: shivammathur/setup-php@v2
-                with:
-                    php-version: 8.0
+            -   
+                name: Reset upmerge branch
+                run: |
+                    git fetch origin ${{ matrix.base_branch }}:${{ matrix.base_branch }}
+                    git reset --hard ${{ matrix.base_branch }}
 
             -
                 name: Create Pull Request
@@ -40,7 +40,7 @@ jobs:
                     title: '[UPMERGE] ${{ matrix.base_branch }} -> ${{ matrix.target_branch }}'
                     body: |
                         This PR has been generated automatically.
-                        For more details see [refactor.yaml](/Sylius/Sylius/blob/1.13/.github/workflows/upmerge_pr.yaml).
+                        For more details see [upmerge_pr.yaml](/Sylius/Sylius/blob/1.13/.github/workflows/upmerge_pr.yaml).
                         
                         **Remember!** Use **rebase strategy** when merging this PR.
                     branch: "upmerge/${{ matrix.base_branch }}_${{ matrix.target_branch }}"