diff --git a/deploy b/deploy index 66db32530b70784534e16811a94ece44cf0acc17..b38dea2c309a7990be031c5d3280afe6b8662d7c 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