mirror of
https://github.com/space-syndicate/space-station-14.git
synced 2026-10-09 18:31:17 +03:00
d9142b3553
# Conflicts: # .github/workflows/conflict-labeler.yml # .github/workflows/labeler-pr.yml # Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml # Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml # Resources/Prototypes/Voice/disease_emotes.yml # Resources/Prototypes/Voice/speech_emotes.yml # Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/equipped-INNERCLOTHING-monkey.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/inhand-left.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/inhand-right.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/equipped-INNERCLOTHING-monkey.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/inhand-left.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/inhand-right.png # Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/base.png # Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/icon.png # Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-0.png # Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-1.png # Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-2.png # Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-3.png # Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-4.png # Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/meta.json
21 lines
615 B
YAML
21 lines
615 B
YAML
name: Check Merge Conflicts
|
|
|
|
on:
|
|
pull_request_target:
|
|
types:
|
|
- opened
|
|
- synchronize
|
|
- reopened
|
|
- ready_for_review
|
|
|
|
jobs:
|
|
Label:
|
|
if: ( github.event.pull_request.draft == false ) && ( github.actor != 'IanComradeBot' )
|
|
runs-on: ubuntu-latest
|
|
steps:
|
|
- name: Check for Merge Conflicts
|
|
uses: eps1lon/actions-label-merge-conflict@v3.0.0
|
|
with:
|
|
dirtyLabel: "Merge Conflict"
|
|
repoToken: "${{ secrets.GITHUB_TOKEN }}"
|
|
commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."
|