From 9622e35ca333bdd635898bd9d34ff6216ff27c9b Mon Sep 17 00:00:00 2001 From: Bruno Eckhardt Date: Mon, 13 Jul 2026 13:32:01 +0200 Subject: [PATCH] fixes --- merge.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/merge.sh b/merge.sh index 3a67250..b741bd4 100644 --- a/merge.sh +++ b/merge.sh @@ -2,24 +2,24 @@ set -e -echo "🚀 Starte automatischen Merge- und Tag-Prozess..." +echo "Starte automatischen Merge- und Tag-Prozess..." git config core.filemode false -echo "🔄 Aktualisiere lokale Branches vom Remote..." +echo "Aktualisiere lokale Branches vom Remote..." git fetch --all --quiet -echo "🌿 Wechsle zu main..." +echo "Wechsle zu main..." git checkout main --quiet git pull origin main --quiet -echo "🔀 Merge: main -> dev..." +echo "Merge: main -> dev..." git checkout dev --quiet git pull origin dev --quiet || true git merge main --no-ff -m "Automated merge from main to dev" --quiet git push origin dev --quiet -echo "🔀 Merge: dev -> live..." +echo "Merge: dev -> live..." git checkout live --quiet git pull origin live --quiet || true git merge dev --no-ff -m "Automated merge from dev to live" --quiet @@ -27,7 +27,7 @@ git push origin live --quiet TAG_NAME="v$(date +'%Y.%m.%d-%H%M')" -echo "🏷️ Erstelle Tag: $TAG_NAME..." +echo " Erstelle Tag: $TAG_NAME..." git tag -a "$TAG_NAME" -m "Automated release tag $TAG_NAME" git push origin "$TAG_NAME" --quiet