From dc42f191337a87e1e01353b495636e65ed602999 Mon Sep 17 00:00:00 2001
From: Stefan Pejcic <stefan@pejcic.rs>
Date: Mon, 19 Aug 2024 12:58:10 +0200
Subject: [PATCH] Update UPDATE.sh

---
 version/0.2.5/UPDATE.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/version/0.2.5/UPDATE.sh b/version/0.2.5/UPDATE.sh
index ff4a772c..f6bbe25f 100644
--- a/version/0.2.5/UPDATE.sh
+++ b/version/0.2.5/UPDATE.sh
@@ -440,9 +440,10 @@ update_config_files() {
     echo "Downloading latest OpenPanel configuration from  https://github.com/stefanpejcic/openpanel-configuration"
     echo ""
     cd /etc/openpanel/
+    git stash
     git fetch origin
-    git checkout origin/main -- .
-    git add .
+    git rebase origin/main
+    git stash pop
     cp /etc/openpanel/docker/compose/new-docker-compose.yml /root/docker-compose.yml
 }