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