diff --git a/.github/workflows/verify-pr.yml b/.github/workflows/verify-pr.yml index 39c0f9c..48db11f 100644 --- a/.github/workflows/verify-pr.yml +++ b/.github/workflows/verify-pr.yml @@ -44,3 +44,17 @@ jobs: else echo "✅ PR title format is valid!" fi + + label-merge-conflicts: + name: Has Conflicts + runs-on: ubuntu-latest + steps: + - name: Check for Merge Conflicts + uses: prince-chrismc/label-merge-conflicts-action@v3 + with: + conflict_label_name: "conflicts" + github_token: ${{ secrets.GITHUB_TOKEN }} + conflict_comment: | + :wave: Hi, @${{ github.actor }}, + I detected conflicts against the base branch :speak_no_evil: + You'll want to sync :arrows_counterclockwise: your branch with upstream! diff --git a/packages/web-push/lib/main.ts b/packages/web-push/lib/main.ts index e69de29..85dc627 100644 --- a/packages/web-push/lib/main.ts +++ b/packages/web-push/lib/main.ts @@ -0,0 +1 @@ +// This is the main page