Skill UI

This skill provides a structured, multi-step workflow for resolving conflicts encountered during in-progress Git merges or rebases. It guides users through analyzing conflict origins, preserving original development intents, resolving conflicting code hunks without introducing new behavior, and executing comprehensive automated checks (typechecking, testing, formatting) to ensure the resulting codebase is stable and functional.

This skill enables you to execute specific work tasks derived from a Product Requirement Document (PRD) or a set of issues. It involves translating requirements into actionable code or deliverables, following best practices like Test-Driven Development (TDD) where applicable. You should run typechecking and tests regularly, commit changes to the current branch, and use the review skill afterwards. It is essential for bridging the gap between planning and execution in software development projects.