From f445f86f3074b6c8c1b185b1cc7e004e462645a4 Mon Sep 17 00:00:00 2001 From: Sebastian Castro <sebastian.castro@protonmail.com> Date: Sat, 15 May 2021 10:43:22 +0000 Subject: [PATCH] Makefile fix reseting master to head --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index bccf7cdb7..4ab4c3207 100755 --- a/Makefile +++ b/Makefile @@ -121,7 +121,7 @@ change-remote: ## Update the remote to new gitlab server url (migrated on May 20 gogo-update: ## Update a PROD server to the lastest version of gogocarto make change-remote sudo /usr/bin/systemctl stop cron - $(GIT) reset --hard master + $(GIT) reset --hard origin/master $(GIT) pull origin master make show-deploy-message COMPOSER_MEMORY_LIMIT=-1 $(COMPOSER) install @@ -137,7 +137,7 @@ gogo-update: ## Update a PROD server to the lastest version of gogocarto gogo-quick-update: make change-remote sudo /usr/bin/systemctl stop cron - $(GIT) reset --hard master + $(GIT) reset --hard origin/master $(GIT) pull origin master make show-deploy-message make purge -- GitLab