Git Conflict Resolution

Acerca de

Provides a safe and structured framework for resolving Git merge conflicts. Instead of attempting direct modifications, this skill first assesses all conflicted files, categorizes them, and generates a comprehensive resolution plan for user approval. It employs intelligent strategies for different conflict types, such as merging imports and tests, regenerating lock files, and handling tricky deleted-but-modified scenarios. This plan-first approach minimizes risk and ensures the intent of all changes is preserved, making it ideal for complex merges.

Características Principales

• 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.
• 4,590 GitHub stars

Casos de Uso

• 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.