jellyfin-web/.github/workflows/merge-conflicts.yml

name: "Merge Conflicts"

on:
  push:
    branches:
      - master
  pull_request:
    types:
      - synchronize
jobs:
  triage:
    runs-on: ubuntu-latest
    if: github.repository == 'jellyfin/jellyfin-web'
    steps:
      - uses: mschilde/auto-label-merge-conflicts@master
        with:
          CONFLICT_LABEL_NAME: "merge conflict"
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Add github action to label PRs with merge conflicts 2020-12-01 08:01:56 -07:00			`name: "Merge Conflicts"`

			`on:`
			`push:`
			`branches:`
			`- master`
Run merge conflict check on PR rebase/commit 2021-03-23 16:47:15 -07:00			`pull_request:`
			`types:`
			`- synchronize`
Add github action to label PRs with merge conflicts 2020-12-01 08:01:56 -07:00			`jobs:`
			`triage:`
			`runs-on: ubuntu-latest`
Prevent merge conflicts action from running on forks 2020-12-02 10:10:10 -07:00			`if: github.repository == 'jellyfin/jellyfin-web'`
Add github action to label PRs with merge conflicts 2020-12-01 08:01:56 -07:00			`steps:`
			`- uses: mschilde/auto-label-merge-conflicts@master`
			`with:`
			`CONFLICT_LABEL_NAME: "merge conflict"`
			`GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}`