Fix finishing up in progress merge

2026-05-21 07:10:07 +00:00 · 2026-03-11 18:24:00 +00:00
parent 6fb1c2a300
commit 5f3f250f83
1 changed files with 1 additions and 1 deletions
@@ -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"