Failed of upgrading Dev-Branch version

[Alan Lim]

I’m trying to upgrade my FOG dev-branch version which is not the most current version. Unfortunately, it keeps prompting me that the Auto-merging is failed. I appreciate it if someone could guide me. Thank you

root@fog-master:/home/user# sudo apt-get install git
Reading package lists… Done
Building dependency tree… Done
Reading state information… Done
git is already the newest version (1:2.39.5-0+deb12u2).
0 upgraded, 0 newly installed, 0 to remove and 45 not upgraded.
root@fog-master:/home/user# sudo apt-get install gif
Reading package lists… Done
Building dependency tree… Done
Reading state information… Done
E: Unable to locate package gif
root@fog-master:/home/user# sudo apt-get install git
Reading package lists… Done
Building dependency tree… Done
Reading state information… Done
git is already the newest version (1:2.39.5-0+deb12u2).
0 upgraded, 0 newly installed, 0 to remove and 45 not upgraded.
root@fog-master:/home/user# git clone https://github.com/FOGProject/fogproject.git /root/fogproject
fatal: destination path ‘/root/fogproject’ already exists and is not an empty directory.
root@fog-master:/home/user# cd /root/fogproject/
root@fog-master:~/fogproject# git checkout dev-branch
Already on ‘dev-branch’
Your branch is ahead of ‘origin/dev-branch’ by 1504 commits.
(use “git push” to publish your local commits)
root@fog-master:~/fogproject# git pull
remote: Enumerating objects: 390, done.
remote: Counting objects: 100% (111/111), done.
remote: Compressing objects: 100% (20/20), done.
remote: Total 390 (delta 92), reused 91 (delta 91), pack-reused 279 (from 1)
Receiving objects: 100% (390/390), 405.71 KiB | 8.63 MiB/s, done.
Resolving deltas: 100% (260/260), completed with 43 local objects.
From https://github.com/FOGProject/fogproject
423a55d2e…f79d7d49e dev-branch -> origin/dev-branch
831a95f32…f151e9dbe stable -> origin/stable
4101c44b9…333e0c8b9 working-1.6 -> origin/working-1.6

• [new tag] 1.5.10.1639 -> 1.5.10.1639
• [new tag] 1.5.10.1634 -> 1.5.10.1634
  Auto-merging SECURITY.md
  Auto-merging lib/common/functions.sh
  Auto-merging packages/web/commons/schema.php
  Auto-merging packages/web/lib/client/fogclient.class.php
  Auto-merging packages/web/lib/fog/fogbase.class.php
  Auto-merging packages/web/lib/fog/fogpage.class.php
  Auto-merging packages/web/lib/fog/host.class.php
  Auto-merging packages/web/lib/fog/system.class.php
  CONFLICT (content): Merge conflict in packages/web/lib/fog/system.class.php
  Auto-merging packages/web/lib/pages/fogconfigurationpage.class.php
  Automatic merge failed; fix conflicts and then commit the result.
  root@fog-master:~/fogproject#