+2

.github/workflows/upstream pretest.yaml

@@ -549,20 +549,11 @@ jobs:
                         if (-not $?) { throw "git push failed" }
                         
                     } elseif ($need_commit_even_minimal) {
-                        $pre_amend_sha = git rev-parse HEAD
-                        Write-Host "- Found insignificant changes after merge conflict ($pre_amend_sha)"
-                        
-                        Write-Host '~~~~~'
-                        git log -5
-                        if (-not $?) { throw "git log failed" }
-                        Write-Host '~~~~~'
-                        git log -5 "origin/$b_core_subm_pretest"
-                        if (-not $?) { throw "git log failed" }
-                        Write-Host '~~~~~'
+                        Write-Host "- Found insignificant changes after merge conflict"
                         
                         git commit -a --amend --no-edit
                         if (-not $?) { throw "git commit failed" }
-                        git push --force-with-lease=origin:$pre_amend_sha
+                        git push --force-with-lease
                         if (-not $?) { throw "git push failed" }
                         
                     } else {