error while updating

[ByEzel93]

Hello, I am getting the following error

`Enter the BillionMail project directory: /opt/Billion-Mail Checking for update.sh script... remote: Enumerating objects: 1352, done. remote: Counting objects: 100% (200/200), done. remote: Compressing objects: 100% (10/10), done. remote: Total 1352 (delta 195), reused 190 (delta 190), pack-reused 1152 (from 1) Receiving objects: 100% (1352/1352), 658.91 KiB | 28.65 MiB/s, done. Resolving deltas: 100% (588/588), completed with 50 local objects. From https://github.com/aaPanel/Billion-Mail

• 7b62458...f17ef0c main -> origin/main (forced update)

• [new branch] demo -> origin/demo

• e7ef04e...ea5a549 dev -> origin/dev (forced update) Updated 0 paths from 210136d

+----------------------------------------------------------------------------- | You are updating BillionMail. This operation will pull the latest code from | GitHub's main branch and rebuild the containers. | | If you have made any modifications, please back them up first. | This operation may overwrite your changes. +-----------------------------------------------------------------------------

Docker Compose version v2.35.1 Docker is running Checking for update.sh script... Updated 1 path from 210136d Stop BillionMail, please wait... [+] Running 8/8 ✔ Container billionmail-core-billionmail-1 Removed 1.7s ✔ Container billionmail-rspamd-billionmail-1 Removed 2.4s ✔ Container billionmail-webmail-billionmail-1 Removed 0.1s ✔ Container billionmail-postfix-billionmail-1 Removed 0.4s ✔ Container billionmail-dovecot-billionmail-1 Removed 2.2s ✔ Container billionmail-redis-billionmail-1 Removed 0.4s ✔ Container billionmail-pgsql-billionmail-1 Removed 0.3s ✔ Network billionmail_billionmail-network Removed 0.2s 🚀 Committing current changes... 🔍 Fetching remote updates... 🔄 Merging changes (strategy: theirs, options: patience)... fatal: refusing to merge unrelated histories ❌ Critical Error: Detected local files conflicting with upstream repository Please move these files to another location before updating: On branch main Your branch and 'origin/main' have diverged, and have 359 and 352 different commits each, respectively. (use "git pull" if you want to integrate the remote branch with yours)

Untracked files: (use "git add ..." to include in what will be committed) conf/rspamd/local.d/worker-controller.inc

nothing added to commit but untracked files present (use "git add" to track)`

[dreambladeflag]

For automatic merge conflict resolution failures, try resetting to upstream main branch:

git fetch origin
git reset --hard origin/main

⚠️ Warning: This will overwrite all local changes. If problems persist, please share:

The error message Your Git version (git --version) Steps to reproduce" More cautious approach: "Instead of forcing a hard reset, you might first try:

git fetch origin
git merge --abort  # If in middle of merge
git reset --merge origin/main

This is safer than --hard. Only use reset --hard if absolutely necessary.

With recovery instructions: To resolve stubborn merge conflicts: First backup your work: git stash Then reset: git fetch && git reset --hard origin/main Reapply changes: git stash pop Let me know if you need help recovering any lost work.