Skills
.Work. You
Rest

git-merge-into

Community

Safely merge and push feature branches

Software Engineering#git#workflow#merge#push#branch#conflict-resolution#feature-branch
Authorglhewett
Version1.0.0
Installs0

System Documentation

What problem does it solve?

Merge a completed feature branch into a target branch while ensuring the target is up-to-date, preventing accidental loss of work, and surfacing merge conflicts for manual resolution.

Core Features & Use Cases

  • Pre-merge validation: Checks for uncommitted changes and warns before proceeding.
  • Safe merge flow: Checks out the target branch, pulls the latest changes, performs a --no-ff merge from the current branch, and pushes the updated target branch.
  • Conflict detection and reporting: Detects merge conflicts and stops to present conflict details instead of attempting automatic resolution.
  • Use Case: A developer finishing a feature can prepare and merge their feature branch into develop or main while ensuring the target is synchronized and conflicts are handled explicitly.

Quick Start

Merge the current feature branch into develop, ensure no uncommitted changes, and push the develop branch to the remote repository.

Dependency Matrix

Required Modules

None required

Components

Standard package

💻 Claude Code Installation

Recommended: Let Claude install automatically. Simply copy and paste the text below to Claude Code.

Please help me install this Skill:
Name: git-merge-into
Download link: https://github.com/glhewett/public-skills/archive/main.zip#git-merge-into

Please download this .zip file, extract it, and install it in the .claude/skills/ directory.
View Source Repository

Agent Skills Search Helper

Install a tiny helper to your Agent, search and equip skill from 471,000+ vetted skills library on demand.