From cdc2f8e713b1fc8b6d23bfbe3dcbeba89933ba80 Mon Sep 17 00:00:00 2001
From: Andreas Fahrecker <andreas@fahrecker.com>
Date: Wed, 10 Apr 2024 06:23:22 +0200
Subject: [PATCH] Jenkins Test

---
 Jenkinsfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Jenkinsfile b/Jenkinsfile
index 8cae61d..8644257 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -40,6 +40,7 @@ pipeline {
                 ]) {
                     sh '''
                         git checkout main
+                        git rebase --abort
                         git pull --rebase
                         git merge build-${BUILD_NUMBER} --no-ff -m "Merge build ${BUILD_NUMBER}"
                         git push