From 58ccff3c008f7138b6062caed63f90a87d5f87a8 Mon Sep 17 00:00:00 2001 From: JeelRajodiya Date: Fri, 30 Dec 2022 17:09:20 +0530 Subject: [PATCH 1/3] tried to resolve branch merging problem --- .github/workflows/prettier.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/prettier.yml b/.github/workflows/prettier.yml index 3bf8cbf..845597b 100644 --- a/.github/workflows/prettier.yml +++ b/.github/workflows/prettier.yml @@ -3,7 +3,7 @@ name: Prettier # This action works with pull requests and pushes on: pull_request: - push: + push: branches: - main @@ -16,7 +16,7 @@ jobs: uses: actions/checkout@v2 with: # Make sure the actual branch is checked out when running on pull requests - ref: ${{ github.head_ref }} + ref: main fetch-depth: 0 # This is important to fetch the changes to the previous commit From 7a4d2f0d971e6f3c90bd44976f955d6c71b12109 Mon Sep 17 00:00:00 2001 From: JeelRajodiya Date: Fri, 30 Dec 2022 17:17:49 +0530 Subject: [PATCH 2/3] test --- .github/workflows/prettier.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/prettier.yml b/.github/workflows/prettier.yml index 845597b..48c9582 100644 --- a/.github/workflows/prettier.yml +++ b/.github/workflows/prettier.yml @@ -16,7 +16,7 @@ jobs: uses: actions/checkout@v2 with: # Make sure the actual branch is checked out when running on pull requests - ref: main + ref: ${{ github.head_ref }} fetch-depth: 0 # This is important to fetch the changes to the previous commit From a6252778b2aeda96439220ade45b9fff57ff3689 Mon Sep 17 00:00:00 2001 From: JeelRajodiya Date: Fri, 30 Dec 2022 17:18:40 +0530 Subject: [PATCH 3/3] success --- .github/workflows/prettier.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/prettier.yml b/.github/workflows/prettier.yml index 48c9582..845597b 100644 --- a/.github/workflows/prettier.yml +++ b/.github/workflows/prettier.yml @@ -16,7 +16,7 @@ jobs: uses: actions/checkout@v2 with: # Make sure the actual branch is checked out when running on pull requests - ref: ${{ github.head_ref }} + ref: main fetch-depth: 0 # This is important to fetch the changes to the previous commit