Xargon/components-template
1
0
Fork 0
mirror of https://github.com/RetroDECK/components-template.git synced 2024-11-24 12:15:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

PR: troubleshooting the PR not being created

Browse source
This commit is contained in:
XargonWan 2024-11-08 10:55:37 +09:00
parent 948f91e081
commit 0cb68766c5
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/pr_from_upstream.yml vendored
View file

@ -68,7 +68,7 @@ jobs:
# Fetch changes from the upstream repository without merging # Fetch changes from the upstream repository without merging
git fetch "${{ env.UPSTREAM_REPO }}" "${{ env.TARGET_BRANCH }}" 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 git diff