Modified Makefile to fix a problem with stable releases

shopgate · Jan 17, 2019 · b03a8f9 · b03a8f9
1 parent 1611002
commit b03a8f9
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/Makefile b/Makefile
@@ -335,6 +335,8 @@ endif
 ifeq ("$(STABLE)-$(UPDATE_MASTER)","true-true")
 		# UPDATING MASTER FOR STABLE RELEASE
 		$(call push-subtrees-to-git, master)
+		git merge origin/master
+		git push origin "releases/$(RELEASE_NAME)"
 		git push origin "releases/$(RELEASE_NAME)":master;
 else
 		# PRE-RELEASE (alpha, beta, rc) or STABLE (without changing master branches)