diff --git a/.github/workflows/evaluate_tree_packing.yml b/.github/workflows/evaluate_tree_packing.yml
index 3bfb597..560263d 100644
--- a/.github/workflows/evaluate_tree_packing.yml
+++ b/.github/workflows/evaluate_tree_packing.yml
@@ -63,7 +63,7 @@ jobs:
           git config --local user.email "github-actions[bot]@users.noreply.github.com"
           git config --local user.name "github-actions[bot]"
           git add README.md
-          git commit -m "Update badges in README"
+          git commit -m "Update badges in README" || echo "No changes to commit"
           if ($env:GITHUB_HEAD_REF) {
           # For pull requests, use the source branch (GITHUB_HEAD_REF)
           $branch_name = $env:GITHUB_HEAD_REF
@@ -72,5 +72,5 @@ jobs:
           $branch_name = $env:GITHUB_REF -replace 'refs/heads/', ''
           }
           git fetch origin
-          git pull origin $branch_name --rebase
+          git rebase origin/$branch_name || git rebase --abort
           git push origin HEAD:$branch_name