From 9e523828bb8a176b0b601c24d2e5102eb4aabf31 Mon Sep 17 00:00:00 2001 From: Sun Serega Date: Sun, 1 Sep 2024 14:56:58 +0200 Subject: [PATCH] +4 --- .github/workflows/upstream pretest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/upstream pretest.yaml b/.github/workflows/upstream pretest.yaml index 5ba7c217..16de503b 100644 --- a/.github/workflows/upstream pretest.yaml +++ b/.github/workflows/upstream pretest.yaml @@ -473,7 +473,7 @@ jobs: git reset "DataScraping/Reps/$subm_name" if (-not $?) { throw "git add failed" } - git merge --continue + git merge --continue --no-edit if (-not $?) { throw "git merge failed" } }