From 74dd4539643b68738cf3b8ae12cab21165fde3c7 Mon Sep 17 00:00:00 2001
From: MatMoul <matmoul@gmail.com>
Date: Sat, 2 Feb 2019 22:28:42 +0100
Subject: [PATCH] Update makerelease

---
 makerelease | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/makerelease b/makerelease
index dfd50ad..4d98a70 100755
--- a/makerelease
+++ b/makerelease
@@ -47,6 +47,7 @@ git commit -a -m "New Release : $version"
 if [ ! "$branch" = "master" ]; then
   echo "Merge branch $branch to master..."
   git checkout master
+  git pull
   git merge $branch
 
   read -p "Delete branch $branch ? (y/N)" choice
@@ -98,5 +99,6 @@ rm -R .build
 
 if [ ! "$branch" = "master" ]; then
   git checkout $branch
+  git merge master
   git push
 fi