Git Conflict Resolution
Resolves complex Git merge conflicts by creating and executing a structured, pre-approved resolution plan.
Key features
- Includes built-in validation, compilation, and testing steps to ensure a successful merge.
- Applies specialized patterns for resolving conflicts in imports, tests, generated files, and configuration.
- Automates the handling of deleted-but-modified files with backups and analysis.
- Interactively prompts for user input with clear options when resolution is ambiguous.
- Creates a detailed, pre-approved resolution plan before making any changes.
Use cases
- Resolving merge conflicts after pulling updates from a main branch into a feature branch.
- Merging a long-running feature branch back into the main development branch.
- Cleaning up a complex merge scenario involving lock files, generated code, and configuration changes.
FAQ
How does this skill improve my workflow?
It improves your workflow by reducing errors and saving time. The 'plan-first' approach prevents mistakes, automation handles tedious merges, and built-in validation steps (compilation, testing) ensure the codebase remains stable after the merge is complete.
What does the Git Conflict Resolution skill do?
This skill provides a structured framework to resolve complex Git merge conflicts. It first assesses all conflicts, creates a detailed resolution plan for your approval, and then intelligently executes the merge using specialized patterns for different file types.
When should I use this skill?
Use this skill immediately when a `git merge` or `git rebase` results in merge conflicts. It is especially powerful for complex situations involving multiple files, generated code (like lockfiles), tests, or deleted-but-modified files.
What key capabilities does it provide?
It features a pre-approved planning stage, specialized resolution patterns for imports and tests, automatic regeneration of generated files, safe handling of deleted files, and interactive prompts for ambiguous cases. It concludes with a full validation and testing phase to guarantee a successful merge.
Related skills
Git Worktree Manager
Manages Git worktrees to enable isolated, parallel development workflows with automated setup.
Developer Tools2,82412 ptsGitHub CLI
Streamlines GitHub workflows like pull requests, issues, and releases directly from the terminal using the official `gh` command-line tool.
Developer Tools2912 ptsOSS Contribution Workflows
Facilitates GitHub-based open source contribution workflows for creating pull requests, issues, and discussions.
Developer Tools5812 pts