Skip to content
This repository was archived by the owner on Aug 6, 2023. It is now read-only.

Commit

Permalink
Add a merge conflict check. (space-wizards#8626)
Browse files Browse the repository at this point in the history
* Add a merge conflict check.

This is directly copied from OpenDreamProject/OpenDream#648

* Update .github/workflows/conflict-labeler.yml

Co-authored-by: ike709 <ike709@users.noreply.github.com>

Co-authored-by: ike709 <ike709@users.noreply.github.com>
  • Loading branch information
moonheart08 and ike709 authored Jun 5, 2022
1 parent bdb6f7d commit ab1b37e
Showing 1 changed file with 18 additions and 0 deletions.
18 changes: 18 additions & 0 deletions .github/workflows/conflict-labeler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: Check Merge Conflicts

on:
push:
branches:
- master
pull_request_target:

jobs:
Label:
runs-on: ubuntu-latest
steps:
- name: Check for Merge Conflicts
uses: eps1lon/actions-label-merge-conflict@513a24fc7dca40990863be2935e059e650728400
with:
dirtyLabel: "Merge Conflict"
repoToken: "${{ secrets.GITHUB_TOKEN }}"
commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."

0 comments on commit ab1b37e

Please sign in to comment.