From 47e531856098fe7b5d1de8da61e60968ff32c1ca Mon Sep 17 00:00:00 2001
From: Andreas Fahrecker <andreas@fahrecker.com>
Date: Wed, 10 Apr 2024 04:55:10 +0200
Subject: [PATCH] Now Maybe?

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

diff --git a/Jenkinsfile b/Jenkinsfile
index be41d49..49b1992 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -38,6 +38,7 @@ pipeline {
                     gitUsernamePassword(credentialsId: 'gitea-jenkins-user-token')
                 ]) {
                     sh '''
+                        git rebase --abort || true
                         git pull --rebase
                         git stash pop || true
                         git add .