From ea27503345cb491f0176367cc3ef9728bfe65489 Mon Sep 17 00:00:00 2001 From: Sun Serega Date: Sat, 14 Sep 2024 07:01:31 +0200 Subject: [PATCH] upstream pretest: ignore `*.log` conflicts --- .github/workflows/upstream pretest.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/upstream pretest.yaml b/.github/workflows/upstream pretest.yaml index d69c9029..bdf7183f 100644 --- a/.github/workflows/upstream pretest.yaml +++ b/.github/workflows/upstream pretest.yaml @@ -476,8 +476,11 @@ jobs: git reset "DataScraping/Reps/$subm_name" if (-not $?) { throw "git reset failed" } + git restore --ours '*.log' + if (-not $?) { throw "git restore failed" } + git commit --no-edit - if (-not $?) { throw "git commit failed" } + if (-not $?) { throw "git commit (after merge) failed" } } git push