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