From e95ebbdb8730053682988e5eeef02eb2cc6b0831 Mon Sep 17 00:00:00 2001
From: "k.triantafyllou" <k.triantafyllou@di.uoa.gr>
Date: Tue, 13 Sep 2022 12:06:45 +0300
Subject: [PATCH] Add merge.sh

---
 merge.sh | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100755 merge.sh

diff --git a/merge.sh b/merge.sh
new file mode 100755
index 0000000..501bf69
--- /dev/null
+++ b/merge.sh
@@ -0,0 +1,3 @@
+git checkout prod
+git merge --no-ff --no-commit origin/master
+git checkout HEAD -- pom.xml