From 4d7d22c33731673a187a8b03a526c5c3fdf6805b Mon Sep 17 00:00:00 2001
From: Thomas Girod <thgirod@hotmail.com>
Date: Thu, 1 Dec 2022 10:01:56 +0100
Subject: [PATCH] edit yml to avoid git conflict when deploying on test

---
 .github/workflows/taiste.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/taiste.yml b/.github/workflows/taiste.yml
index 4a2ae8f6..676476b7 100644
--- a/.github/workflows/taiste.yml
+++ b/.github/workflows/taiste.yml
@@ -34,7 +34,8 @@ jobs:
           export PATH="$HOME/.poetry/bin:$PATH"
           pushd ${{secrets.SITH_PATH}}
 
-          git pull
+          git fetch
+          git reset --hard origin/taiste
           poetry update
           poetry run ./manage.py migrate
           echo "yes" | poetry run ./manage.py collectstatic