Fix finishing up in progress merge

henrymercer · henrymercer · commit 5f3f250f837f · 2026-03-11T18:24:00.000Z
diff --git a/.github/workflows/rebuild.yml b/.github/workflows/rebuild.yml
@@ -114,7 +114,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 --no-edit
+              git commit --no-edit
             else
               echo "No in-progress merge detected, committing changes."
               git commit -m "Rebuild"
