From 33c1a7fa0c774c9dfde688760400355fa89b6224 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=A2=E3=83=AC=E3=82=AF=E3=82=B5=E3=83=B3=E3=83=80?= =?UTF-8?q?=E3=83=BC=2Eeth?= Date: Wed, 9 Oct 2024 05:11:51 +0900 Subject: [PATCH] fix: allow new changes --- .github/workflows/sync-template.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/sync-template.yml b/.github/workflows/sync-template.yml index ad753e27..6fef3ba8 100644 --- a/.github/workflows/sync-template.yml +++ b/.github/workflows/sync-template.yml @@ -47,10 +47,10 @@ jobs: exit 0 fi git commit -m "chore: sync template" - git fetch origin "$pr_branch" + git fetch origin "$pr_branch" || true git pull origin "$branch_name" --rebase - git push "$original_remote" "$pr_branch" + git push -f "$original_remote" "$pr_branch" gh pr create --title "Sync branch to template" \ --body "This pull request merges changes from the template repository." \ --head "$pr_branch" \ - --base "$branch_name" \ No newline at end of file + --base "$branch_name" || true \ No newline at end of file