Skills
.Work. You
Rest

merge-changes

Community

Merge session work back cleanly

Software Engineering#git#version control#commit#merge#branch#conflicts#session workflow
Authoraadorian
Version1.0.0
Installs0

System Documentation

What problem does it solve?

This Skill helps you bring work from a topic branch back into the merge base branch without losing changes or stalling on unresolved conflicts.

Core Features & Use Cases

  • Pre-merge cleanup: Commits any uncommitted changes before starting the merge so the branch is in a safe state.
  • Branch integration: Merges the topic branch into the target branch as part of a session workflow or handoff process.
  • Conflict resolution: Guides you through merge conflicts, with a fallback to ask for user guidance when the correct resolution is unclear.

Quick Start

Merge the topic branch into the merge base branch and resolve any conflicts, committing the merge when needed.

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: merge-changes
Download link: https://github.com/aadorian/VSCode_Readme/archive/main.zip#merge-changes

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 536,000+ vetted skills library on demand.