Resolve merge conflicts efficiently
Help me resolve Git conflicts: 1. Identify conflict markers 2. Choose incoming vs current changes 3. Handle complex multi-file conflicts 4. Use merge tools effectively 5. Verify resolution correctness
Generate semantic git commit messages from staged changes following conventional commit format.
Generate comprehensive pull request descriptions with context, changes, and testing notes.
Generate standardized git branch names from issue titles or feature descriptions.
AI Agent Skills are reusable workflow packages that extend your AI coding assistant with multi-step capabilities. Install Git Conflict Resolution by following these steps.
.cursor/skills/ or .codex/skills/ directoryGenerate semantic git commit messages from staged changes following conventional commit format.
Generate comprehensive pull request descriptions with context, changes, and testing notes.
Generate standardized git branch names from issue titles or feature descriptions.