Merge pull request #3459 from github/copilot/fix-github-actions-workflow-again

Fix `git merge --continue` missing --no-edit in Rebuild workflow
2026-05-29 05:00:55 +03:00 · 2026-02-05 15:00:59 +00:00
parent 7deb0a15d3 7a44a9db3f
commit 77591e2c4a
1 changed files with 1 additions and 1 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"