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 }