.claude/skills/merge-and-cleanup/SKILL.md
6. Report final status
Install
npx skillscat add julianobarbosa/claude-code-skills/skills-merge-and-cleanup-skill Install via the SkillsCat registry.
About this skill
This skill automates the process of merging a feature branch into the main branch and cleaning up afterward. It handles committing changes, switching to main, merging with fast-forward preference, pushing updates, and deleting the feature branch both locally and remotely. Use it when a feature branch is complete and ready to be integrated into the main codebase.
SKILL.md
.claude/skills/merge-and-cleanup/SKILL.md
Merge Feature Branch to Main
- Ensure all changes are committed on current branch
- Switch to main:
git checkout main && git pull - Merge feature branch:
git merge --ff-only <branch>(if fails, use regular merge and resolve conflicts) - Push main:
git push origin main - Delete feature branch:
git branch -d <branch> && git push origin --delete <branch> - Report final status
Install
npx skillscat add julianobarbosa/claude-code-skills/skills-merge-and-cleanup-skill Install via the SkillsCat registry.