This commit is contained in:
Fredrik Burmester
2025-01-06 10:13:40 +01:00
parent 8288682e68
commit b243524a7d
2 changed files with 12 additions and 73 deletions

12
scripts/automerge.sh Normal file
View File

@@ -0,0 +1,12 @@
#!/bin/bash
[[ -z $(git status --porcelain) ]] &&
git checkout main &&
git pull --ff-only &&
git checkout develop &&
git merge main &&
git push --follow-tags &&
git checkout main &&
git merge develop --ff-only &&
git push &&
git checkout develop ||
(echo "Error: Failed to merge" && exit 1)