From aa31851e77158b917d3c1588d6860b3125686299 Mon Sep 17 00:00:00 2001 From: AnimeGitB Date: Tue, 12 Jul 2022 11:42:39 +0930 Subject: [PATCH] Make LintRatchet hard reset to development every run --- .github/workflows/lint_commit.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lint_commit.yml b/.github/workflows/lint_commit.yml index 99721641e..684cbe4bf 100644 --- a/.github/workflows/lint_commit.yml +++ b/.github/workflows/lint_commit.yml @@ -29,7 +29,8 @@ jobs: # - name: Fetch this repo's LintRatchet branch # run: git fetch origin LintRatchet:LintRatchet - run: git checkout LintRatchet - - run: git merge development + # - run: git merge development + - run: git reset --hard development - run: git stash pop - run: git add -u - run: git commit -m 'Fix whitespace [skip actions]' @@ -37,4 +38,4 @@ jobs: run: python manage_languages.py -u - run: git add -u - run: git commit -m 'Update languages [skip actions]' - - run: git push --set-upstream origin LintRatchet + - run: git push --set-upstream --force origin LintRatchet