From bb834e2cce9235008fbde98f40ffe7a4c56527ad Mon Sep 17 00:00:00 2001 From: Sun Serega Date: Sun, 1 Sep 2024 14:45:28 +0200 Subject: [PATCH] +3 --- .github/workflows/upstream pretest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/upstream pretest.yaml b/.github/workflows/upstream pretest.yaml index f71cf6c3..5ba7c217 100644 --- a/.github/workflows/upstream pretest.yaml +++ b/.github/workflows/upstream pretest.yaml @@ -470,7 +470,7 @@ jobs: if (-not $?) { Write-Host "----- Simple merge failed, trying to fix submodule conflict" - git add "DataScraping/Reps/$subm_name" + git reset "DataScraping/Reps/$subm_name" if (-not $?) { throw "git add failed" } git merge --continue