Compare commits

...
Author SHA1 Message Date
Bruno Eckhardt 9622e35ca3 fixes 2026-07-13 13:32:01 +02:00
+6 -6
View File
@@ -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