Skip to content

Commit

Permalink
add a workflow to alarm for merge conflict automatically
Browse files Browse the repository at this point in the history
Signed-off-by: spacewander <[email protected]>
  • Loading branch information
spacewander committed Jul 3, 2024
1 parent 22e1afc commit 71e5896
Showing 1 changed file with 22 additions and 0 deletions.
22 changes: 22 additions & 0 deletions .github/workflows/merge-conflicts.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Auto Label Conflicts
on:
pull_request_target:
# So that PRs touching the same files as the push are updated
push:

permissions:
issues: write
pull-requests: write

jobs:
auto-label-conflicts:
runs-on: ubuntu-latest
steps:
- name: conflict
uses: "eps1lon/[email protected]"
with:
dirtyLabel: "conflict"
repoToken: ${{ github.token }}
commentOnDirty: |
:wave: Hi, I detected conflicts against the base branch :speak_no_evil:
You'll want to sync :arrows_counterclockwise: your branch with upstream!

0 comments on commit 71e5896

Please sign in to comment.