From dee6663a7097d2197fdaca4698cdf5db6128c3e1 Mon Sep 17 00:00:00 2001 From: rudolf Date: Sat, 10 Jan 2026 21:31:01 +0100 Subject: [PATCH] merge and squash main --- .github/workflows/{rebase_on_main.yaml => merge_main.yaml} | 2 +- .../{rebase_no_merge_main.yaml => merge_main_and_squash.yaml} | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename .github/workflows/{rebase_on_main.yaml => merge_main.yaml} (98%) rename .github/workflows/{rebase_no_merge_main.yaml => merge_main_and_squash.yaml} (95%) diff --git a/.github/workflows/rebase_on_main.yaml b/.github/workflows/merge_main.yaml similarity index 98% rename from .github/workflows/rebase_on_main.yaml rename to .github/workflows/merge_main.yaml index 788d519..4ac593b 100644 --- a/.github/workflows/rebase_on_main.yaml +++ b/.github/workflows/merge_main.yaml @@ -1,4 +1,4 @@ -name: Merge branches onto main +name: Merge main to all on: push: diff --git a/.github/workflows/rebase_no_merge_main.yaml b/.github/workflows/merge_main_and_squash.yaml similarity index 95% rename from .github/workflows/rebase_no_merge_main.yaml rename to .github/workflows/merge_main_and_squash.yaml index f8264da..1c4b52d 100644 --- a/.github/workflows/rebase_no_merge_main.yaml +++ b/.github/workflows/merge_main_and_squash.yaml @@ -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"