+2

SunSerega · Aug 25, 2024 · 08340a6 · 08340a6
1 parent a915829
commit 08340a6
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.github/workflows/upstream pretest.yaml b/.github/workflows/upstream pretest.yaml
@@ -349,8 +349,8 @@ jobs:
                         
                     }
                     
-                    Write-Host "Merging with main:"
-                    git merge main
+                    Write-Host "Merging with 0_official/main:"
+                    git merge 0_official/main
                     if (-not $?) { throw "git merge failed" }
                     git push
                     if (-not $?) { throw "git push failed" }