Test

2025-08-17 14:10:56 +00:00
parent 63980fe4c4
commit b6f26c1143
3 changed files with 99 additions and 0 deletions
@@ -0,0 +1,22 @@
+#!/bin/bash
+# Skript: Dev in Master mergen
+
+DEV_BRANCH="dev"
+MASTER_BRANCH="master"
+
+# Auf master wechseln und aktuell holen
+git checkout $MASTER_BRANCH
+git pull origin $MASTER_BRANCH
+
+# Dev aktuell holen
+git checkout $DEV_BRANCH
+git pull origin $DEV_BRANCH
+
+# Merge Dev in Master
+git checkout $MASTER_BRANCH
+git merge --no-ff $DEV_BRANCH -m "Merge $DEV_BRANCH into $MASTER_BRANCH"
+
+# Push Master auf Remote
+git push origin $MASTER_BRANCH
+
+echo "Branch $DEV_BRANCH wurde in $MASTER_BRANCH gemerged."