Skip to content

Commit a68c12d

Browse files
authored
ci: [WPN-7] Auto label for conflict PRs in CI/CD (#14)
* ci: [WPN-7] Auto label for conflict PRs in CI/CD * test: This is a test
1 parent 106ea69 commit a68c12d

2 files changed

Lines changed: 15 additions & 0 deletions

File tree

.github/workflows/verify-pr.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,3 +44,17 @@ jobs:
4444
else
4545
echo "✅ PR title format is valid!"
4646
fi
47+
48+
label-merge-conflicts:
49+
name: Has Conflicts
50+
runs-on: ubuntu-latest
51+
steps:
52+
- name: Check for Merge Conflicts
53+
uses: prince-chrismc/label-merge-conflicts-action@v3
54+
with:
55+
conflict_label_name: "conflicts"
56+
github_token: ${{ secrets.GITHUB_TOKEN }}
57+
conflict_comment: |
58+
:wave: Hi, @${{ github.actor }},
59+
I detected conflicts against the base branch :speak_no_evil:
60+
You'll want to sync :arrows_counterclockwise: your branch with upstream!

packages/web-push/lib/main.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
// This is the main page

0 commit comments

Comments
 (0)