Skip to content

Commit

Permalink
upstream pretest: ignore *.log conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
SunSerega committed Sep 14, 2024
1 parent 64e6196 commit 4a1e37a
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion .github/workflows/upstream pretest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -476,8 +476,11 @@ jobs:
git reset "DataScraping/Reps/$subm_name"
if (-not $?) { throw "git reset failed" }
git add *.log
if (-not $?) { throw "git add (unmerged *.log files) failed" }
git commit --no-edit
if (-not $?) { throw "git commit failed" }
if (-not $?) { throw "git commit (after merge) failed" }
}
git push
Expand Down

0 comments on commit 4a1e37a

Please sign in to comment.