From c55c0904dde07454ada9bd82db80bff910ca5ed7 Mon Sep 17 00:00:00 2001
From: Jonathan Foucher <jfoucher@gmail.com>
Date: Thu, 25 Aug 2022 10:13:05 +0200
Subject: [PATCH] Ad git stash before pull to save local changes.

---
 deploy | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/deploy b/deploy
index 66db3253..b38dea2c 100755
--- a/deploy
+++ b/deploy
@@ -7,6 +7,8 @@ php8.1 artisan down
 # remove mix-manifest to prevent conflicts
 rm public/mix-manifest.json
 #pull latest code
+#git stash to prevent pull conflict
+git stash
 git pull
 
 ## Composer
-- 
GitLab