diff --git a/.github/workflows/pr_from_upstream.yml b/.github/workflows/pr_from_upstream.yml index 9f289b2..5816ccd 100644 --- a/.github/workflows/pr_from_upstream.yml +++ b/.github/workflows/pr_from_upstream.yml @@ -68,7 +68,7 @@ jobs: # Fetch changes from the upstream repository without merging git fetch "${{ env.UPSTREAM_REPO }}" "${{ env.TARGET_BRANCH }}" - git pull "${{ env.UPSTREAM_REPO }}" "${{ env.TARGET_BRANCH }}" + git merge "${{ env.UPSTREAM_REPO }}/$TARGET_BRANCH" --no-ff || true git diff