From 189bf4f373fa4dc6d4093afa7fa6927634e41849 Mon Sep 17 00:00:00 2001
From: Andreas Fahrecker <andreas@fahrecker.com>
Date: Wed, 10 Apr 2024 04:16:02 +0200
Subject: [PATCH] Jenkins Maybe Fix Git Error

---
 Jenkinsfile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 843d37f..be41d49 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -24,6 +24,7 @@ pipeline {
                     git checkout main
                     mkdir -p dist
                     npm run compile
+                    git stash
                 '''
             }
         }
@@ -37,9 +38,10 @@ pipeline {
                     gitUsernamePassword(credentialsId: 'gitea-jenkins-user-token')
                 ]) {
                     sh '''
+                        git pull --rebase
+                        git stash pop || true
                         git add .
                         git commit -m "Update Compiled Adblock List"
-                        git pull --rebase
                         git push
                     '''
                 }