From 143bf7af1e749b39189a2e84eea2d0d971bcdd74 Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Mon, 31 Jul 2023 15:11:53 +0200
Subject: [PATCH] merge-upstream.sh: Allow merging specific version

---
 merge_upstream.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/merge_upstream.sh b/merge_upstream.sh
index cfbea1f..e772262 100755
--- a/merge_upstream.sh
+++ b/merge_upstream.sh
@@ -23,7 +23,13 @@ automatic_i18n_reversion
 automatic_packagejson_reversion
 
 # Merge upstream
-get_latest_upstream_tag
+
+# Check if specific version to merge passed
+if [ -z "$1" ]; then
+    get_latest_upstream_tag
+else
+    latest_upstream_tag="$1"
+fi
 forelement_repos git merge "$latest_upstream_tag"
 
 get_current_mxsdk_tags