fix: allow new changes

ubiquity · Oct 8, 2024 · 0bf3679 · 0bf3679
1 parent 98da5c9
commit 0bf3679
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/.github/workflows/sync-template.yml b/.github/workflows/sync-template.yml
@@ -42,6 +42,15 @@ jobs:
           cp -rf ts-template/* .
           rm -rf ts-template/
           git add .
+          if git diff --staged --quiet; then
+            echo "No changes to sync from template."
+            exit 0
+          fi
           git commit -m "chore: sync template"
+          git fetch origin "$pr_branch"
+          git pull origin "$branch_name" --rebase
           git push "$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"
+          gh pr create --title "Sync branch to template" \
+                       --body "This pull request merges changes from the template repository." \
+                       --head "$pr_branch" \
+                       --base "$branch_name"