Skip to content
Check Merge Conflicts

Merge remote-tracking branch 'upstream/master' #5

Sign in to view logs

Merge remote-tracking branch 'upstream/master'

Merge remote-tracking branch 'upstream/master' #5

Workflow file for this run

.github/workflows/conflict-labeler.yml at e3af2ab
name: Check Merge Conflicts
on:
push:
branches:
- master
pull_request_target:
jobs:
Label:
if: github.actor != 'PJBot' && github.actor != 'DeltaV-Bot' && github.actor != 'SimpleStation14'r != 'Lost-Paradise-Bot'

Check failure on line 11 in .github/workflows/conflict-labeler.yml

View workflow run for this annotation

GitHub Actions / Check Merge Conflicts

Invalid workflow file 

The workflow is not valid. .github/workflows/conflict-labeler.yml (Line: 11, Col: 9): Unexpected symbol: 'r'. Located at position 93 within expression: github.actor != 'PJBot' && github.actor != 'DeltaV-Bot' && github.actor != 'SimpleStation14'r != 'Lost-Paradise-Bot'
runs-on: ubuntu-latest
steps:
- name: Check for Merge Conflicts
uses: ike709/actions-label-merge-conflict@9eefdd17e10566023c46d2dc6dc04fcb8ec76142
with:
dirtyLabel: "Статус: Конфликт"
repoToken: "${{ secrets.BOT_TOKEN }}"
commentOnDirty: "В этом ПР'е есть конфликты, пожалуйста, устраните их, прежде чем мы сможем оценить ваш ПР."