From e4a8f175bc4eab1ad6e257600f94e3fb731ab3f9 Mon Sep 17 00:00:00 2001
From: DamienGilliard <127743632+DamienGilliard@users.noreply.github.com>
Date: Mon, 16 Sep 2024 05:00:28 +0200
Subject: [PATCH] FIX-WIP: fixing issue with commit and push by bot

---
 .github/workflows/evaluate_tree_packing.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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