From 3b9b0dde567e30a7e23c8cc097ddb5c2655474c3 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@bento.schottelius.org>
Date: Wed, 28 Aug 2013 16:22:20 +0200
Subject: [PATCH] require branch merge to happen before pypi

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index c61a6daf..1183be6f 100644
--- a/Makefile
+++ b/Makefile
@@ -211,7 +211,7 @@ git-release: git-tag
 #
 PYPI_FILE=.lock-pypi
 
-pypi-release: $(PYPI_FILE)
+pypi-release: $(PYPI_FILE) git-branch-merge
 
 $(PYPI_FILE): man $(VERSION_FILE)
 	python3 setup.py sdist upload