Use --autostash in sync-vps.sh to handle local unstaged changes
This commit is contained in:
+1
-1
@@ -5,7 +5,7 @@ set -e
|
|||||||
cd "$(dirname "$0")/.."
|
cd "$(dirname "$0")/.."
|
||||||
|
|
||||||
echo "==> Pulling web-edit commits from VPS..."
|
echo "==> Pulling web-edit commits from VPS..."
|
||||||
git pull --rebase vps main
|
git pull --rebase --autostash vps main
|
||||||
|
|
||||||
echo "==> Pushing site submodule to VPS..."
|
echo "==> Pushing site submodule to VPS..."
|
||||||
(cd site && git push vps main)
|
(cd site && git push vps main)
|
||||||
|
|||||||
Reference in New Issue
Block a user