skills.rest
aadorian
aadorianCOMMUNITY
Explore all skills by this author →
GitHub

merge-changes

Merge a topic branch into its merge base branch with conflict resolution.

Updated Mar 28, 2026
Search Tags:#git#version control#commit#merge#branch#conflicts#session workflow
One-click install
npx skills add https://github.com/aadorian/VSCode_Readme --skill merge-changes
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: merge-changes
Source: https://github.com/aadorian/VSCode_Readme/tree/main/education/sessions-chat-and-agents/sessions/skills/merge-changes
Command: npx skills add https://github.com/aadorian/VSCode_Readme --skill merge-changes

SYSTEM DOCUMENTATION & REQUIREMENTS

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.

Frequently Asked Questions about merge-changes

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

FAQPage Schema
How do I merge a topic branch into its base branch without losing uncommitted changes?▼

Merging a topic branch safely requires committing dirty work first during pre-merge cleanup, ensuring the branch is in a safe state before integrating session work into the merge base branch.

What is the best way to handle merge conflicts during a Git branch integration?▼

Handling merge conflicts during branch integration involves guided resolution with correct conflict fixes, falling back to ask for user guidance when the correct resolution remains ambiguous or unclear.

How does a Git session workflow manage handoffs when merging uncommitted work?▼

A Git session workflow manages handoffs by preserving uncommitted work through automatic pre-merge commits, then merging the topic branch into the merge base branch to complete the integration safely.

Do I need to commit dirty work before starting a branch merge?▼

Yes, you need to commit dirty work before starting a branch merge. Pre-merge cleanup commits uncommitted changes automatically so the branch is in a safe state for integration.

What happens if a merge conflict resolution is unclear during branch integration?▼

If a merge conflict resolution is unclear during branch integration, the process pauses and asks for user guidance to resolve the ambiguity, ensuring the merge completes safely without incorrect assumptions.

Related Skills

Explore More Software Engineering Skills→
RamachandrajoshiRamachandrajoshi

finishing-a-development-branch

Automate final Git branch integration by merging, pushing, or discarding.

Community
Advanced
malinskibeniaminmalinskibeniamin
3

commit-push-pr

Automate commit, push, and pull request creation with CI monitoring.

Community
Advanced
jk278jk278

git-analyzer

Analyze git repositories to summarize commit history and file changes.

Community
Intermediate
bmsull560bmsull560

jr-rebase

Resolves git rebase conflicts in feature branches via guided marker resolution.

Community
Intermediate