Acerca de
This skill provides a structured framework for managing Git conflicts that occur during rebase or merge operations. It automatically detects conflict states, identifies affected files, and guides the user through resolving differences by presenting clear comparisons between local and incoming changes. By offering specific resolution options—such as choosing 'ours', 'theirs', or performing manual integration—and handling finalization commands like 'git rebase --continue', it minimizes human error and reduces the friction of complex version control tasks.
