Acerca de
The Git Conflict Resolver skill streamlines the often tedious process of handling code collisions by providing Claude with specialized context scripts and safety hooks. It allows for advanced three-way merge analysis—accessing Base, Ours, and Theirs versions of files—and utilizes Git's 'rerere' functionality to automate repeated resolutions. A critical safety feature includes an automated check that prevents continuing a rebase or merge if conflict markers remain in the codebase, ensuring a clean and functional commit history.
