upstream pretest: reset funcs.bin on merge fail

SunSerega · Jan 16, 2025 · 9969870 · 9969870
1 parent e125deb
commit 9969870
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/.github/workflows/upstream pretest.yaml b/.github/workflows/upstream pretest.yaml
@@ -519,7 +519,10 @@ jobs:
                             Write-Host "----- Simple merge failed, trying to fix submodule conflict"
                             
                             git reset "DataScraping/Reps/$subm_name"
-                            if (-not $?) { throw "git reset failed" }
+                            if (-not $?) { throw "git reset $subm_name failed" }
+                            
+                            git reset 'DataScraping/XML/*/funcs.bin'
+                            if (-not $?) { throw "git reset funcs.bin failed" }
                             
                             git add *.log
                             if (-not $?) { throw "git add (unmerged *.log files) failed" }