mirror of
https://github.com/narrrl/holy-flavor-rater.git
synced 2026-11-04 17:07:01 +01:00
15 lines
361 B
Bash
Executable File
15 lines
361 B
Bash
Executable File
sudo docker compose down
|
|
git stash
|
|
git checkout main
|
|
git pull
|
|
git checkout narl.io
|
|
git merge main
|
|
git stash apply
|
|
CONFLICTS=$(git ls-files -u | wc -l)
|
|
if [ "$CONFLICTS" -gt 0 ] ; then
|
|
echo "There are merge conflicts, resolve them and run `sudo docker compose up -d --build` or abort with `git merge --abort`"
|
|
exit -1
|
|
fi
|
|
|
|
sudo docker compose up -d --build
|