From af852927a94faeb67934fdb1232837698eaf54c0 Mon Sep 17 00:00:00 2001 From: rugk Date: Wed, 13 Oct 2021 20:07:45 +0200 Subject: [PATCH] Fix PHP refresh pipeline merge See https://github.com/PrivateBin/PrivateBin/pull/847#issuecomment-942580850 Now merging the origin as master is not yet pulled. --- .github/workflows/refresh-php8.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/refresh-php8.yml b/.github/workflows/refresh-php8.yml index 76e8f85..a73c2af 100644 --- a/.github/workflows/refresh-php8.yml +++ b/.github/workflows/refresh-php8.yml @@ -22,7 +22,7 @@ jobs: fetch-depth: 0 - name: Merge master changes into php8 - run: git merge master + run: git merge origin/master - name: Push new changes uses: github-actions-x/commit@v2.8