Skip to content
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.

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

Merge Conflict Checker GitHub Action #166

Open
aditiverma-21 opened this issue Nov 9, 2024 · 1 comment
Open

Merge Conflict Checker GitHub Action #166

aditiverma-21 opened this issue Nov 9, 2024 · 1 comment

Comments

@aditiverma-21
Copy link
Contributor

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.

Copy link

github-actions bot commented Nov 9, 2024

👋 Thanks for opening this issue! We appreciate your contribution. Please make sure you’ve provided all the necessary details and screenshots, and don't forget to follow our Guidelines and Code of Conduct. Happy coding! 🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

1 participant