+3

SunSerega · Sep 1, 2024 · bb834e2 · bb834e2
1 parent c460254
commit bb834e2
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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