finish-feature

What problem does it solves? Merging feature branches back into the main development line can be a meticulous and error-prone process, involving multiple Git commands, status checks, and conflict resolutions. This Skill automates the entire workflow, ensuring a smooth and reliable merge.

Core Features & Use Cases

• Automated Merge Workflow: Guides you through verifying the current branch, checking the working directory, switching to main, pulling the latest changes, merging the feature branch, and pushing to the remote.
• Conflict Handling: Intelligently detects merge conflicts, notifies you, and lists conflicting files, allowing for focused manual resolution when necessary.
• Optional Branch Deletion: Offers to clean up by deleting the feature branch both locally and remotely after a successful merge.
• Use Case: After completing a feature, simply tell Claude "finish the user-auth feature." It will handle all the Git operations, from pulling the latest main to merging and pushing, ensuring your main branch is up-to-date and your feature branch is cleanly integrated.

Quick Start

Finish the current feature branch and merge it into the main branch, then push the changes.