From 1ce631e5290583c85445e6d7c0d6e6b43606bf17 Mon Sep 17 00:00:00 2001 From: Adrian Duesselberg Date: Thu, 12 Sep 2024 08:45:42 +0200 Subject: [PATCH] Reverted changes in build.py --- .github/workflows/root-ci-config/build_root.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/root-ci-config/build_root.py b/.github/workflows/root-ci-config/build_root.py index 96b0ef269ea25..4559622b7528c 100755 --- a/.github/workflows/root-ci-config/build_root.py +++ b/.github/workflows/root-ci-config/build_root.py @@ -434,10 +434,7 @@ def rebase(directory: str, repository:str, base_ref: str, head_ref: str, head_sh git config user.name 'ROOT Continous Integration' git fetch {repository} {branch} - git checkout {head_ref} -f - git status - git diff - git reset --hard + git checkout {head_ref} git rebase {base_ref} """)