From abf4a952b09987aca21234d766ef690188b7c413 Mon Sep 17 00:00:00 2001
From: Romain Boman <romain.boman@gmail.com>
Date: Mon, 22 Jan 2024 08:55:49 +0100
Subject: [PATCH] new script

---
 bin/mtf_merge_master_into_boman.sh | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100755 bin/mtf_merge_master_into_boman.sh

diff --git a/bin/mtf_merge_master_into_boman.sh b/bin/mtf_merge_master_into_boman.sh
new file mode 100755
index 00000000..9876a424
--- /dev/null
+++ b/bin/mtf_merge_master_into_boman.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+# merge master into boman branch for all Metafor repos
+# this script should be run from the root directory of the workspace
+
+# note: the script does not push boman branch to origin
+
+
+function update_repo {
+    cd $1
+    git checkout boman
+    git pull
+    git merge origin/master
+    cd ..
+}
+
+# update each repo one by one
+update_repo oo_meta 
+update_repo oo_nda 
+update_repo keygen 
+update_repo parasolid 
+update_repo MetaforSetup 
+
+# linuxbin uses "master" branch
+cd linuxbin
+git checkout master
+git pull
+
+# pull the changes manually...