Skip to content

feat: add automated merge conflict labeling workflow #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
akshat99812 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: add automated merge conflict labeling workflow #60

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions .github/workflows/label-conflicts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: PR Maintenance
on:
# Check when a PR is updated
pull_request_target:
types: [opened, synchronize, reopened]
# Crucial: Re-check all PRs when Next.js code is merged to main
Copy link

@coderabbitai coderabbitai bot Feb 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

Copy-paste artifact: comment references "Next.js" instead of this project.

This comment appears to be copied from another repository's workflow. It should reference "Maelstrom-WebUI" (or simply be made generic) rather than "Next.js."

Proposed fix 
-  # Crucial: Re-check all PRs when Next.js code is merged to main
+  # Crucial: Re-check all open PRs when code is merged to main
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
# Crucial: Re-check all PRs when Next.js code is merged to main
# Crucial: Re-check all open PRs when code is merged to main
🤖 Prompt for AI Agents 
In @.github/workflows/label-conflicts.yml at line 6, The workflow comment
contains a copy-paste artifact referencing "Next.js"; update the text in
.github/workflows/label-conflicts.yml (the comment line "# Crucial: Re-check all
PRs when Next.js code is merged to main") to refer to this repo (e.g.,
"Maelstrom-WebUI") or make it generic (e.g., "when code is merged to main") so
it accurately describes the project; ensure the replaced string "Next.js" is
removed and the intent of re-checking PRs is preserved.

push:
branches: [main]

jobs:
conflict-check:
runs-on: ubuntu-latest
permissions:
contents: read
pull-requests: write
steps:
- name: Update Conflict Labels
uses: eps1lon/actions-label-merge-conflict@v3
with:
dirtyLabel: "status: conflicted"
removeOnClean: true
repoToken: "${{ secrets.GITHUB_TOKEN }}"
# A friendly nudge for the contributor
commentOnDirty: |
Hello! This PR now has conflicts with the main branch.
Please rebase or merge main into your branch to keep the review process moving! 🚀