Merges a topic branch into the base branch across Git worktrees with conflict resolution.
npx skills add https://github.com/jimeh/hucode --skill merge-jimeh
Please help me install this Agent Skill. Skill: merge Source: https://github.com/jimeh/hucode/tree/main/src/vs/sessions/skills/merge Command: npx skills add https://github.com/jimeh/hucode --skill merge-jimeh
git -C against the main worktree without leaving the current worktree. - Guided conflict resolution: Lists conflicted files, resolves them while preserving both sides' intent, stages results, and commits the merge. - Safety guardrails: Prohibits force-pushing, skipping hooks, and rewriting commits without explicit user approval. - Use Case: After finishing a feature in a session worktree, ask the assistant to merge the topic branch back into the base branch; it commits pending changes, performs the merge, resolves conflicts, and validates the result. ## Quick Start Merge my session's topic branch back into the base branch in the main worktree and resolve any conflicts.High-intent search queries and answers about installing and using this skill.
Use git -C <main-worktree-path> merge <topic-branch> to run the merge against the main worktree without leaving your current worktree. This merges the topic branch into the base branch checked out there.
List conflicted files with git diff --name-only --diff-filter=U, edit each file to preserve the intent of both sides, stage them with git add, then run git commit --no-edit to complete the merge.
Yes, run git merge --abort to cancel the in-progress merge and restore the branch to its pre-merge state. This is safe to do before any merge commit has been created.
Run git merge-base --is-ancestor <topic-branch> HEAD to confirm the topic branch is an ancestor of the base branch. Also check git status --porcelain to confirm the worktree is clean.
Uncommitted changes in the current worktree must be committed first, checked via git status --porcelain. The skill delegates this to the /commit skill before proceeding with the merge.
posit-devMerges a topic branch into the base branch across git worktrees with conflict resolution.
cacr92Merge a feature branch into main and clean up branches and worktree.
PaulKinlanRun full test suites and compare results against a baseline to detect regressions.
JacobPEvansRebase pull requests onto main with signed commits and GitHub API checks.