Description
This GitHub Action, named Merge Conflict Checker, automatically checks for merge conflicts when a pull request is opened, synchronized, or reopened. If a merge conflict with the main branch is detected, it will post a warning comment on the pull request, alerting the contributor to resolve the conflicts before merging.
Key Features:
- Triggers: Runs on pull_request events (opened, synchronize, or reopened).
- Permissions: Requires write access to pull requests and read access to repository contents.
- Jobs:
- Check for Merge Conflicts: Fetches the latest from origin/main and verifies if the current branch is up-to-date. If conflicts exist, the job exits with an error.
-Post Warning Comment: If conflicts are detected, a comment is added to the pull request to notify the contributor.
This action helps maintain a smooth workflow by notifying contributors about merge conflicts early in the PR process, reducing potential bottlenecks during merges.
Description
This GitHub Action, named Merge Conflict Checker, automatically checks for merge conflicts when a pull request is opened, synchronized, or reopened. If a merge conflict with the main branch is detected, it will post a warning comment on the pull request, alerting the contributor to resolve the conflicts before merging.
Key Features:
-Post Warning Comment: If conflicts are detected, a comment is added to the pull request to notify the contributor.
This action helps maintain a smooth workflow by notifying contributors about merge conflicts early in the PR process, reducing potential bottlenecks during merges.