ConceptProd/ConceptPortal-public
1
0
Fork 0
mirror of https://github.com/IRBorisov/ConceptPortal.git synced 2025-06-26 13:00:39 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Force git to ignore any conflicts after merges

Browse Source
This commit is contained in:
IRBorisov 2024-05-09 13:13:49 +03:00
parent 230d17da35
commit 03fd5d054b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/prod/UpdateProd.sh
View File

@ -1,8 +1,8 @@
COMPOSE_FILE="docker-compose-prod.yml" COMPOSE_FILE="docker-compose-prod.yml"
BACKUP_SCRIPT="./scripts/prod/CreateBackup.sh" BACKUP_SCRIPT="./scripts/prod/CreateBackup.sh"
git reset --hard git fetch --all
git pull git reset --hard origin/main
/bin/bash "${BACKUP_SCRIPT}" /bin/bash "${BACKUP_SCRIPT}"