From 57285aba52c16404a88aca0e8ca8b1b204159c66 Mon Sep 17 00:00:00 2001 From: ducoterra Date: Mon, 1 Nov 2021 10:02:35 -0400 Subject: [PATCH] Remove warning from make-update make-update isn't as destructive as it once was. It should be safe to run as long as the developer is fixes any weird merge conflicts after stash pop. --- .gitlab/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab/Makefile b/.gitlab/Makefile index 02f380c..320f9d4 100644 --- a/.gitlab/Makefile +++ b/.gitlab/Makefile @@ -21,7 +21,7 @@ make-stash-drop: @if [ ! -z "$$(git stash list | grep -r 'stash@{0}.*common')" ]; then git stash drop; fi .PHONY: make-update -make-update: warning +make-update: @git stash save $(STASH) -git subtree pull --prefix .gitlab git@gitlab.ducoterra.net:services/common.git main --squash @if [ ! -z "$$(git stash list | grep -r 'stash@{0}.*common')" ]; then git stash pop; fi