always squash

This commit is contained in:
2026-01-10 21:44:51 +01:00
parent dee6663a70
commit 2de7c555d0
+3 -1
View File
@@ -52,7 +52,9 @@ jobs:
# Merge origin/main into branch (non-interactive)
if git merge --no-edit --squash "origin/$MAIN"; then
# Push updated branch to remote (no force)
if git push origin "$br" --force; then
git reset --soft "origin/$MAIN"
git commit -m "Squash"
if git push origin "$br" --force-with-lease; then
echo "Pushed merged $br"
else
echo "Push failed for $br"