👷 Detect and label merge conflicts on PRs automatically (#1552) · ByteDecoder/sqlmodel@3b1b70c · GitHub

1. ByteDecoder
2. sqlmodel

Repository navigation

• Code
• Pull requests
• Actions
• Projects
• Security and quality
• Insights

Commit 3b1b70c

Browse filesBrowse the repository at this point in the historyBrowse files

svlandeg

authored

👷 Detect and label merge conflicts on PRs automatically (fastapi#1552)

1 parent 55abec9 commit 3b1b70c
Copy full SHA for 3b1b70c

1 file changed

+19Lines changed: 19 additions & 0 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• .github/workflows
  • detect-conflicts.yml

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎.github/workflows/detect-conflicts.yml‎

Copy file name to clipboard

+19Lines changed: 19 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -0,0 +1,19 @@
	1	+ name: "Conflict detector"
	2	+ on:
	3	+ push:
	4	+ pull_request_target:
	5	+ types: [synchronize]
	6	+
	7	+ jobs:
	8	+ main:
	9	+ permissions:
	10	+ contents: read
	11	+ pull-requests: write
	12	+ runs-on: ubuntu-latest
	13	+ steps:
	14	+ - name: Check if PRs have merge conflicts
	15	+ uses: eps1lon/actions-label-merge-conflict@v3
	16	+ with:
	17	+ dirtyLabel: "conflicts"
	18	+ repoToken: "${{ secrets.GITHUB_TOKEN }}"
	19	+ commentOnDirty: "This pull request has a merge conflict that needs to be resolved."

0 commit comments

Comments

0 (0)