1 files changed, 12 insertions, 0 deletions
diff --git a/merge.sh b/merge.sh
new file mode 100755
index 00000000..8595bcfd
--- /dev/null
+++ b/merge.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+git checkout master
+git pull local/master MaYor-dev
+
+git checkout MaYor-dev
+git merge devel
+
+git checkout master
+git merge MaYor-dev
+
+