Update celery.yml

sweeftdigital · Oct 24, 2024 · feb961b · feb961b
1 parent 2d55ad5
commit feb961b
Showing 1 changed file with 1 addition and 2 deletions.
diff --git 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