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.

gitmerge-conflictscollaborationversion-control

Варианты использования

  • 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-opus-4-6claude-sonnet-4-6gpt-5deepseek-v4

Совместимые инструменты

claude-codecursorgithub-copilotkiroany

Модальности

Вход: code, text
→
Выход: code, text

Похожие Skills

code-reviewcommit-message-writergit-pr-description

Автор

OpenModels Community

@openmodelsrun