njust-ai-conflict-resolution
CommunitySmartly resolve Git merge conflicts.
Software Engineering#git#conflict-resolution#workflows#pull-request#version-control#merge-conflicts#git-blame
AuthorJunjieChen0
Version1.0.0
Installs0
System Documentation
What problem does it solve?
Provides comprehensive guidelines for resolving merge conflicts intelligently using git history and commit context to determine the best course of action during PR changes or rebases.
Core Features & Use Cases
- Analyze commit messages, git blame, and diffs to infer intent behind conflicting changes.
- Provide structured resolution strategies for PR conflicts, rebases, and multi-file merges.
- Offer actionable steps and guardrails to ensure safe, reproducible conflict resolution.
Quick Start
Provide the PR number and a list of conflicting files to start the conflict-resolution workflow.
Dependency Matrix
Required Modules
None requiredComponents
Standard package💻 Claude Code Installation
Recommended: Let Claude install automatically. Simply copy and paste the text below to Claude Code.
Please help me install this Skill: Name: njust-ai-conflict-resolution Download link: https://github.com/JunjieChen0/NJUST/archive/main.zip#njust-ai-conflict-resolution Please download this .zip file, extract it, and install it in the .claude/skills/ directory.
Agent Skills Search Helper
Install a tiny helper to your Agent, search and equip skill from 510,000+ vetted skills library on demand.