Merge branch 'main' into dependabot/npm_and_yarn/npm-minor-4c1fc3d0aa

Author: henrymercer

.github/workflows/rebuild.yml

@@ -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"