Merge remote-tracking branch 'origin/releases/v4' into backport-v3.32.2-45cbd0c69

2026-05-07 22:30:44 +00:00 · 2026-02-05 17:12:25 +00:00
parent e5a63de15c 45cbd0c69e
commit 24e739f51f
23 changed files with 183891 additions and 98360 deletions
@@ -111,7 +111,7 @@ jobs:
            # Otherwise, just commit the changes.
            if git rev-parse --verify MERGE_HEAD >/dev/null 2>&1; then
              echo "In progress merge detected, finishing it up."
-              git merge --continue
+              git merge --continue --no-edit
            else
              echo "No in-progress merge detected, committing changes."
              git commit -m "Rebuild"