Resolves complex Git merge conflicts by creating and executing a structured, pre-approved resolution plan.
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
01Includes built-in validation, compilation, and testing steps to ensure a successful merge.
02Applies specialized patterns for resolving conflicts in imports, tests, generated files, and configuration.
03Automates the handling of deleted-but-modified files with backups and analysis.
04Interactively prompts for user input with clear options when resolution is ambiguous.
05Creates a detailed, pre-approved resolution plan before making any changes.
064,590 GitHub stars
Casos de Uso
01Resolving merge conflicts after pulling updates from a main branch into a feature branch.
02Merging a long-running feature branch back into the main development branch.
03Cleaning up a complex merge scenario involving lock files, generated code, and configuration changes.
