From 03fd5d054bd2310b42a0fb7007776f55595041b7 Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Thu, 9 May 2024 13:13:49 +0300
Subject: [PATCH] Force git to ignore any conflicts after merges

---
 scripts/prod/UpdateProd.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/prod/UpdateProd.sh b/scripts/prod/UpdateProd.sh
index 4294b019..43e314e9 100644
--- a/scripts/prod/UpdateProd.sh
+++ b/scripts/prod/UpdateProd.sh
@@ -1,8 +1,8 @@
 COMPOSE_FILE="docker-compose-prod.yml"
 BACKUP_SCRIPT="./scripts/prod/CreateBackup.sh"
 
-git reset --hard
-git pull
+git fetch --all
+git reset --hard origin/main
 
 /bin/bash "${BACKUP_SCRIPT}"