From 1b4208229af874c13954fda930364e16fef73186 Mon Sep 17 00:00:00 2001
From: Johannes Junggeburth <johannes.josef.junggeburth@cern.ch>
Date: Sat, 9 Mar 2024 09:03:40 +0100
Subject: [PATCH] Update athena_build.sh
---
athena_ci/athena_build.sh | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/athena_ci/athena_build.sh b/athena_ci/athena_build.sh
index e67e32225..ac20f4fc4 100755
--- a/athena_ci/athena_build.sh
+++ b/athena_ci/athena_build.sh
@@ -100,7 +100,15 @@ heading "Rebase the GeoModel code base w.r.t. main"
cd ${CI_PROJECT_DIR}
git fetch origin
+
+fill_line "Changes w.r.t to main before rebase"
+
+git diff HEAD origin/main
git rebase origin/main
+fill_line "Changes w.r.t to main after rebase"
+
+git diff HEAD origin/main
+
cd ${BUILD_DIR}
--
GitLab