From e07d7887bc8574a901721d9f3d0c127c5d9e7557 Mon Sep 17 00:00:00 2001
From: Andreas Fahrecker <andreas@fahrecker.com>
Date: Wed, 10 Apr 2024 05:53:02 +0200
Subject: [PATCH] JEnkins File merge instead of rebase

---
 Jenkinsfile | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 49b1992..92a6611 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -21,7 +21,7 @@ pipeline {
             }
             steps {
                 sh '''
-                    git checkout main
+                    git checkout -b build-${BUILD_NUMBER}
                     mkdir -p dist
                     npm run compile
                     git stash
@@ -38,11 +38,9 @@ pipeline {
                     gitUsernamePassword(credentialsId: 'gitea-jenkins-user-token')
                 ]) {
                     sh '''
-                        git rebase --abort || true
+                        git checkout main
                         git pull --rebase
-                        git stash pop || true
-                        git add .
-                        git commit -m "Update Compiled Adblock List"
+                        git merge build-${BUILD_NUMBER} --no-ff -m "Merge build ${BUILD_NUMBER}"
                         git push
                     '''
                 }