merge

Merges a feature branch into the base branch using a commit.

1|Updated Mar 2, 2026

Search Tags:#automation #git #branching #cleanup #code integration #merge

Ready to run

npx skills add https://github.com/sjev/robodev --skill merge-sjev

💬 Prompt for ChatGPT / Claude Chat▼

Please help me install this Agent Skill.
Skill: merge
Source: https://github.com/sjev/robodev/tree/main/skills/merge
Command: npx skills add https://github.com/sjev/robodev --skill merge-sjev

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes scripts (resource) components.

What problem does it solve?

This Skill streamlines the process of integrating completed feature branches into the main codebase, ensuring a clean and organized Git history.

Core Features & Use Cases

Automated Merging: Merges the current feature branch into the main branch using a merge commit.
Artifact Cleanup: Removes temporary feature specification and review documents as part of the merge commit.
Branch Management: Deletes the feature branch automatically upon successful merge.
Use Case: After a feature has been fully implemented, tested, and approved, use this skill to seamlessly merge it into main, removing associated draft documentation and cleaning up the branch.

Quick Start

Use the merge skill to merge the feature branch named 'auth-login' into main.

Frequently Asked Questions about merge

High-intent search queries and answers about installing and using this skill.

FAQPage Schema

How do I merge a feature branch into main and clean up temporary files automatically?▼

To merge a feature branch and clean up temporary files automatically, you can use an automated script that integrates the branch using a merge commit strategy, removes feature specification documents within that commit, and deletes the local branch afterward.

Does automated branch cleanup remove feature documentation during a git merge?▼

Yes, automated branch cleanup can remove feature documentation during a git merge. The process integrates the feature branch and removes temporary review documents as part of the merge commit itself.

How do I delete a local feature branch after a successful merge commit?▼

To delete a local feature branch after a successful merge commit, the merge process must complete successfully before triggering an automated branch deletion command to ensure a clean local repository state.

What is the best way to organize git history when integrating completed feature branches?▼

The best way to organize git history when integrating completed feature branches is to use a merge commit strategy. This preserves context by creating an explicit commit while simultaneously cleaning up temporary artifacts and deleting the branch.

Do I need to follow branch naming conventions to automate code integration and cleanup?▼

Yes, you need to follow strict branch naming conventions to automate code integration and cleanup. The automation relies on standardized branch names to correctly identify the target feature branch and execute the merge and cleanup sequence.

Why use a merge commit instead of squashing when integrating a feature branch?▼

Using a merge commit instead of squashing preserves the complete history and context of the feature branch. It enables simultaneous artifact cleanup within the explicit merge commit before the local branch is deleted.