From 91383521d3ecddb5e6949c79f09f669ba5baa3b5 Mon Sep 17 00:00:00 2001 From: Sun Serega Date: Sun, 1 Sep 2024 15:11:44 +0200 Subject: [PATCH] +9 --- .github/workflows/upstream pretest.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/upstream pretest.yaml b/.github/workflows/upstream pretest.yaml index eb50a277..5b4dfeb1 100644 --- a/.github/workflows/upstream pretest.yaml +++ b/.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