Skip to content

Commit

Permalink
fix: swap out conflict label action
Browse files Browse the repository at this point in the history
  • Loading branch information
KTrain5169 committed Aug 26, 2024
1 parent 233fa98 commit b8c8721
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions .github/workflows/pr_management.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,14 @@ jobs:
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
config-path: .github/labeler.yml
- name: Label PR if it cannot be merged
if: github.event.action == 'opened' || github.event.action == 'synchronise'
id: merge-conflict-check
uses: prulloac/[email protected]

- name: Label & comment if PR has conflict
uses: eps1lon/[email protected]
with:
token: ${{ secrets.GITHUB_TOKEN }}
dirtyLabel: "Merge conflict identified"
repoToken: "${{ secrets.GITHUB_TOKEN }}"
commentOnDirty: "This pull request has conflicts with the base branch, which is ${{ github.base_ref }}. Please resolve them."
commentOnClean: "Resolved conflicts!"

- name: Assign/unassign reviewers
if: github.event.action == 'ready_for_review'
Expand Down

0 comments on commit b8c8721

Please sign in to comment.