skills.rest
voidful
voidfulCOMMUNITY
Explore all skills by this author →
WebsiteGitHub

merge

Merge a topic branch into the base branch with conflict resolution and validation.

1|Updated Apr 8, 2026
Search Tags:#git#version control#worktree#merge#conflict resolution#branch
One-click install
npx skills add https://github.com/voidful/Aixlarity --skill merge-voidful
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: merge
Source: https://github.com/voidful/Aixlarity/tree/main/aixlarity-ide/src/vs/sessions/skills/merge
Command: npx skills add https://github.com/voidful/Aixlarity --skill merge-voidful

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve? Merging session work back into the base branch involves multiple error-prone steps: committing leftover changes, running the merge in the correct worktree, resolving conflicts, and verifying the result. This Skill guides the AI through that entire git merge workflow safely. ## Core Features & Use Cases - Pre-merge Commit: Detects uncommitted changes in the current worktree and commits them before merging. - Cross-Worktree Merge: Runs git commands against the main worktree using git -C without leaving the current worktree. - Conflict Resolution: Lists conflicted files, resolves conflicts while preserving both sides' intent, and asks the user when uncertain. - Post-merge Validation: Confirms the worktree is clean and the topic branch is fully merged into the base branch. - Use Case: After finishing a feature in an isolated session worktree, ask the AI to merge the topic branch back into the main branch, with conflicts resolved interactively and the result verified. ## Quick Start Ask the AI to merge the current session's topic branch back into the base branch and resolve any conflicts that come up.

Frequently Asked Questions about merge

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

FAQPage Schema
How do I merge a git branch from another worktree?▼

Use `git -C <main-worktree-path> merge <topic-branch>` to run the merge against the main worktree without leaving your current worktree. Commit any uncommitted changes in the current worktree first.

How to resolve git merge conflicts step by step?▼

List conflicted files with `git diff --name-only --diff-filter=U`, read each file, resolve conflicts preserving both sides' intent, stage with `git add`, then commit with `git commit --no-edit`. Ask for guidance when resolution is ambiguous.

How do I verify a git merge completed successfully?▼

Check the worktree is clean with `git status --porcelain`, then confirm all commits merged using `git merge-base --is-ancestor <topic-branch> HEAD`, which verifies the topic branch is an ancestor of the base branch.

Can I abort a git merge after conflicts appear?▼

Yes, run `git merge --abort` to restore the pre-merge state. The Skill supports this when the user decides not to proceed with conflict resolution.

What git operations are blocked during an automated merge?▼

Force-pushing (`--force`, `--force-with-lease`), skipping pre-push hooks (`--no-verify`), and rewriting or dropping commits are prohibited without explicit user approval.

Related Skills

Explore More Software Engineering Skills→
posit-devposit-dev
4.2k

merge

Merges a topic branch into the base branch across git worktrees with conflict resolution.

Official
Intermediate
JacobPEvansJacobPEvans
3

refresh-repo

Synchronize a local Git repository and check open Pull Requests for merge readiness.

Community
Intermediate
johngrandsonjohngrandson

pull

Merge origin/main into the current branch with rerere-enabled conflict resolution.

Community
Intermediate
Knuckles-TeamKnuckles-Team
2

git-advanced

Automate Git history fixes using rebase, cherry-pick, and bisect workflows.

Official
Advanced