forked from admin/brencher
merge and squash main
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
name: Merge branches onto main
|
||||
name: Merge main to all
|
||||
|
||||
on:
|
||||
push:
|
||||
+2
-2
@@ -1,4 +1,4 @@
|
||||
name: Rebase branches onto main
|
||||
name: Merge main to all and squash
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
@@ -50,7 +50,7 @@ jobs:
|
||||
# Create/update a local branch from remote
|
||||
git checkout -B "$br" "origin/$br"
|
||||
# Merge origin/main into branch (non-interactive)
|
||||
if git rebase "origin/$MAIN"; then
|
||||
if git merge --no-edit --squash "origin/$MAIN"; then
|
||||
# Push updated branch to remote (no force)
|
||||
if git push origin "$br" --force; then
|
||||
echo "Pushed merged $br"
|
||||
Reference in New Issue
Block a user