This is a submission for the GitHub Copilot CLI Challenge
What I Built
MergeGuard is a proactive CLI tool designed to eliminate "Conflicts."
Problem: While working in a team we always needed to verbally communicate regarding the changes & ask other developers to take a pull OR while taking pull, unaware of changes we end up getting conflicts. So, here MergeGuard comes into play.
Key Features:
Real-time Watch Mode: Continuously monitors your active branch for remote updates.
Line-Level Analysis: It identifies the exact line-range overlaps between your local work and the remote.
AI Risk Assessment: Uses Llama AI to analyze the codebase and classify the conflict risk as NONE, LOW, MEDIUM, or HIGH.
Resolution Strategies: Provides AI-generated suggestions on how to approach the merge before it even happens.
Demo
Demo Video: Click Here
My Experience with GitHub Copilot CLI
MergeGuard integrates GitHub CLI (gh) to retrieve commit metadata (author + commit message) and combines it with git diffs to proactively detect merge conflict risk.
Top comments (0)