Git Conflict Resolver
中级development最低上下文：32K
Analyzes and resolves git merge conflicts by understanding the intent of both sides. Examines the conflict markers, surrounding context, and commit history to produce a correct merged result that preserves both changes without breaking functionality.
使用场景
- Resolving complex merge conflicts in large files
- Understanding intent behind conflicting changes
- Merging long-lived feature branches
- Resolving conflicts in generated files (lockfiles, configs)
- Batch-resolving multiple conflicts in a single merge
示例提示词
Resolve the following git merge conflict. Context: - Branch A (ours): [describe what this branch was doing] - Branch B (theirs): [describe what this branch was doing] Conflicted file: ``` <<<<<<< HEAD [our version] ======= [their version] >>>>>>> feature-branch ``` Please: 1. Explain what each side was trying to do 2. Provide the correctly merged result 3. Flag if both changes can coexist or if one should win 4. Note any potential issues with the merged result
推荐模型
兼容工具
claude-codecursorgithub-copilotkiroany
模态
输入: code, text
→输出: code, text
相关 Skills
作者
OpenModels Community