From 928aaa12b6b34d9872eda4effca9217ecda8e245 Mon Sep 17 00:00:00 2001
From: Roman Mogilatov <rmogilatov@gmail.com>
Date: Fri, 9 Jun 2017 01:45:12 +0300
Subject: [PATCH] Update makefile

---
 Makefile | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index f3684c28..73c32de4 100644
--- a/Makefile
+++ b/Makefile
@@ -58,8 +58,13 @@ check:
 	pydocstyle examples/
 
 publish: cythonize
-	# Create and upload build
-	python setup.py sdist upload
+	# Merge release to master branch
+	git checkout master
+	git merge --no-ff release/$(VERSION)
+	git commit -m 'Release $(VERSION)'
+	git push origin master
 	# Create and upload tag
 	git tag -a $(VERSION) -m 'version $(VERSION)'
 	git push --tags
+	# Create and upload build
+	python setup.py sdist upload