From 0cb68766c59c682a724a02aed160ff1d36511cba Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 8 Nov 2024 10:55:37 +0900 Subject: [PATCH] PR: troubleshooting the PR not being created --- .github/workflows/pr_from_upstream.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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