From feb961b445ed08e8a8ccb436d984e082b98e082a Mon Sep 17 00:00:00 2001
From: natatchikhinashvili
 <153913348+natatchikhinashvili@users.noreply.github.com>
Date: Thu, 24 Oct 2024 19:40:14 +0400
Subject: [PATCH] Update celery.yml

---
 .github/workflows/celery.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/celery.yml b/.github/workflows/celery.yml
index 07e5557..0c56325 100644
--- a/.github/workflows/celery.yml
+++ b/.github/workflows/celery.yml
@@ -23,8 +23,7 @@ jobs:
             cd /home/nata_tchikhinashvili/
             source venv/bin/activate
             cd /home/nata_tchikhinashvili/accounts_G2
-            git fetch origin
-            git reset --hard origin/dev
+            git pull --strategy-option theirs
             git checkout dev
             pip3 install -r requirements.txt
             deactivate