We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent 106ea69 commit a68c12dCopy full SHA for a68c12d
2 files changed
.github/workflows/verify-pr.yml
@@ -44,3 +44,17 @@ jobs:
44
else
45
echo "✅ PR title format is valid!"
46
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
@@ -0,0 +1 @@
1
+// This is the main page
0 commit comments