Run merge conflict check on PR rebase/commit · 8ce58f611b - jellyfin-web - Jones Residence

wjones/jellyfin-web

Run merge conflict check on PR rebase/commit

This commit is contained in:

Fernando Fernández

2021-03-24 00:47:15 +01:00

committed by

GitHub

parent 6a60938b09

commit 8ce58f611b

1 changed files with 3 additions and 0 deletions

									
										.github/workflows/merge-conflicts.yml
									
		+3
		
												View File
												
				@@ -4,6 +4,9 @@ on:

				  push:

				    branches:

				      - master

				  pull_request:

				    types:

				      - synchronize

				jobs:

				  triage:

				    runs-on: ubuntu-latest