+9

.github/workflows/upstream pretest.yaml

@@ -469,15 +469,15 @@ jobs:
                         
                         # expecting fast-forward when possible
                         Write-Host "--- Merging with ${b_core_main}:"
-                        git merge $b_core_main --no-edit -m "[trivial] Merge $b_core_main into subm-pretest/..."
+                        git merge $b_core_main -m "[trivial] Merge $b_core_main into subm-pretest/..."
                         if (-not $?) {
                             Write-Host "----- Simple merge failed, trying to fix submodule conflict"
                             
                             git reset "DataScraping/Reps/$subm_name"
-                            if (-not $?) { throw "git add failed" }
+                            if (-not $?) { throw "git reset failed" }
                             
-                            git merge --continue
-                            if (-not $?) { throw "git merge failed" }
+                            git commit --no-edit
+                            if (-not $?) { throw "git commit failed" }
                             
                         }
                         git push