diff --git a/deploy.sh b/deploy.sh index 68ed269..89ba255 100755 --- a/deploy.sh +++ b/deploy.sh @@ -29,13 +29,14 @@ trap cleanup EXIT main() { log "Starting deployment..." - # Git pull force - log "Pulling latest changes from the repository..." - git pull origin main --force + log "Updating repository to match remote main branch..." + git fetch origin + git checkout -f origin/main if [ $? -ne 0 ]; then - log "Failed to pull latest changes." + log "Failed to update to the latest main branch." exit 1 fi + log "Repository successfully updated to latest main branch." # Lancer le docker log "Building and starting Docker containers..."