I have a few conflict messages while updating to the newest version. Please advise how I should fix it. Thank you

root@fog-master:~/fogproject# 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:~/fogproject# git checkout dev-branch
Already on ‘dev-branch’
Your branch is ahead of ‘origin/dev-branch’ by 1503 commits.
(use “git push” to publish your local commits)
root@fog-master:~/fogproject# git pull
remote: Enumerating objects: 1829, done.
remote: Counting objects: 100% (67/67), done.
remote: Compressing objects: 100% (48/48), done.
remote: Total 1829 (delta 36), reused 19 (delta 19), pack-reused 1762 (from 2)
Receiving objects: 100% (1829/1829), 19.27 MiB | 16.87 MiB/s, done.
Resolving deltas: 100% (1137/1137), completed with 2 local objects.
From https://github.com/FOGProject/fogproject
959fd030b…423a55d2e dev-branch -> origin/dev-branch
079576c6c…831a95f32 stable -> origin/stable
b72cc83e1…4101c44b9 working-1.6 -> origin/working-1.6

• [new tag] 1.5.10.1629 -> 1.5.10.1629
• [new tag] 1.5.10.1566 -> 1.5.10.1566
• [new tag] 1.5.10.1593 -> 1.5.10.1593
• [new tag] 1.5.10.1615 -> 1.5.10.1615
• [new tag] 1.5.10.1622 -> 1.5.10.1622
  Auto-merging README.md
  Auto-merging lib/common/functions.sh
  Auto-merging packages/web/commons/schema.php
  CONFLICT (content): Merge conflict in packages/web/commons/schema.php
  Auto-merging packages/web/lib/fog/fogbase.class.php
  CONFLICT (content): Merge conflict in packages/web/lib/fog/fogbase.class.php
  Auto-merging packages/web/lib/fog/fogpage.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
  Auto-merging packages/web/lib/reg-task/taskqueue.class.php
  Auto-merging packages/web/management/export.php
  CONFLICT (content): Merge conflict in packages/web/management/export.php
  Auto-merging packages/web/management/languages/de_DE.UTF-8/LC_MESSAGES/messages.po
  Auto-merging packages/web/management/languages/en_US.UTF-8/LC_MESSAGES/messages.po
  Auto-merging packages/web/management/languages/es_ES.UTF-8/LC_MESSAGES/messages.po
  Auto-merging packages/web/management/languages/fr_FR.UTF-8/LC_MESSAGES/messages.po
  Auto-merging packages/web/management/languages/it_IT.UTF-8/LC_MESSAGES/messages.po
  Auto-merging packages/web/management/languages/messages.pot
  Auto-merging packages/web/management/languages/pt_BR.UTF-8/LC_MESSAGES/messages.po
  Auto-merging packages/web/management/languages/zh_CN.UTF-8/LC_MESSAGES/messages.po
  Auto-merging utils/FOGiPXE/buildipxe.sh
  CONFLICT (content): Merge conflict in utils/FOGiPXE/buildipxe.sh
  Automatic merge failed; fix conflicts and then commit the result.

@george1421 Thank you for the information. I have managed to migrate/images, /snapin and the database to another new FOG server. Some steps needed to be done such as replacing the original IP with new IP. Because I intended not to use the original IP for the new FOG server as a backup plan. If anythings goes wrong with the new FOG server and I can revert to the original FOG server.

The following is my FOG layout which is Fog master and another storage node running on version 1.5.10.15.
a) Fog Master with storage = 192.168.1.1
b) Fog storage node = 192.168.1.2

I have a physical box came with a 10G network adapter and I want it to replace the Fog master. I want all the settings from the Fog master such as Host (name and mac), Groups, Images, Storage node and etc migrated to the new physical box. I still want to retain the item b (storage node)
I would appreciate someone could guide me how to achieve. Thank you

@Sebastian-Roth Sorry for late reply. I have discovered some of the clients did not run the task that I configured in the Snapins. Therefore, I would like to re-run the task again but couldn’t find an option to achieve the task.

Is it possible to re-run or force to deploy snapins if they have been deployed before?

I have created a new storage node (Node 1) and some machines cannot perform image deployment from this new node. The following are the errors that appeared during the deployment.

Starting sshd: touch: cannot touch ‘/var/lock/sshd’ : No such file or directory
OK

• Running post init scripts … (after few minutes)

Reason: mount: mounting xxx.xxx.xxx.xxx:/image failed: Connection timed out.

It happened only on one of the VLAN and let’s call it VLAN10. It is strange that the VLAN 10 has no problem deploying images from the master node. But another VLAN has no problem deploying images from Node 1.

Which log file that I investigate?
Has anyone encountered such a problem?
Appreciate it if someone could guide me. thank you

How to change the fogreplicator.log time to local time? Currently, it shows the UTC time. Thankyou

fogreplicator.log
[09-18-23 7:17:36 am] | Image Name:
[09-18-23 7:17:36 am] | There are no other members to sync to.
[09-18-23 7:17:36 am] * Not syncing Image between groups
[09-18-23 7:17:36 am] | Image Name: Win10-Tableau
[09-18-23 7:17:36 am] | There are no other members to sync to.
[09-18-23 7:17:36 am] * Attempting to perform Group -> Nodes image replication.
[09-18-23 7:17:36 am] * Not syncing Image between nodes
[09-18-23 7:17:36 am] | Image Name: Win10-Tableau
[09-18-23 7:17:36 am] | There are no other members to sync to.

root@Fog-Master:/opt/fog/log# timedatectl
Local time: Mon 2023-09-18 15:19:28 +08
Universal time: Mon 2023-09-18 07:19:28 UTC
RTC time: Mon 2023-09-18 07:19:28
Time zone: Asia/Singapore (+08, +0800)
System clock synchronized: yes
NTP service: n/a
RTC in local TZ: no
root@Fog-Master:/opt/fog/log#

@george1421 Thank you for the guide link. The FOG is able to mount the external NFS as a storage node. However, there were errors that appeared after the end of the cloning. It doesn’t seem stable to me. Also, understand that the storage node might break if the FOG version is upgraded to the next version.
Therefore, at this moment, I have set up a physical machine instead of a VM to eliminate the issues.

I’m just set up Fog on Debian OS and installed it on the ESXi 7. Due to limited storage space, I would like to add an external NAS (Synology) as a storage node.
Upon PXE boot from the client, the NFS failed to mount and below is the message.
Reason: mount: mounting 172.20.149.70:/volume1/Fog-Master/dev on /images failed: Permission denied.
But I was able to mount it from the Debian which hosts the Fog server. Below is the command.
mount -t nfs 172.20.149.70:/volume1/Fog_Master /mnt (configured Synolog NFS to accept anonymous)
Below is the Fog Storage setting.
IP Address: 172.20.149.70
Image Path: /volume1/fog_Master
Management Username: Synology admin ID
Management Password: Synology admin password

Why is Debian able to mount but Fog can’t?
I appreciate it if someone would advise me on what I miss. Thank you

@astrugatch
Thank you for the url link and the link is a guide of how to add extra storage into VM as a local disk.
But I want is to map and connect direct to NetApp as a additional storage.