skills.rest
Veloxia-agency
Veloxia-agencyCOMMUNITY
Explore all skills by this author →
GitHub

merge

Merge the winning agent branch into the base branch with no-ff merge and archive tags.

Updated Apr 24, 2026
Search Tags:#git#worktrees#session management#merge#archiving#branches
One-click install
npx skills add https://github.com/Veloxia-agency/VELOXIA-WEB --skill merge-veloxia-agency
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: merge
Source: https://github.com/Veloxia-agency/VELOXIA-WEB/tree/main/.claude/skills/engineering/agenthub/skills/merge
Command: npx skills add https://github.com/Veloxia-agency/VELOXIA-WEB --skill merge-veloxia-agency

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This Skill streamlines the final step of an agent session by safely merging the winning branch, preserving the losing branches for traceability, and cleaning up temporary worktrees.

Core Features & Use Cases

  • Winner Selection: Uses the latest evaluation ranking or an explicitly chosen agent to identify the branch to merge.
  • Safe Merge Workflow: Performs a no-ff merge into the base branch so the full history remains clear and auditable.
  • Cleanup and Archiving: Tags losing branches before deleting their refs and removes session worktrees to keep the repository tidy.
  • Use Case: Ideal for multi-agent coding sessions where one implementation is selected and the rest must be archived without losing commit history.

Quick Start

Use the merge skill to merge session 20260317-143022 into the base branch after reviewing the diff summary and confirming the winner.

Frequently Asked Questions about merge

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

FAQPage Schema
How do I merge the winning branch from a multi-agent git session into the base branch?▼

To merge the winning branch from a multi-agent git session, this Skill performs a safe no-ff merge into the base branch. This ensures the full commit history remains clear and auditable before cleaning up temporary worktrees.

What is the best way to archive losing branches in a multi-agent coding workflow?▼

The best way to archive losing branches in a multi-agent coding workflow is to apply archive tags to them before deleting their refs. This preserves the commit history for traceability without cluttering the active repository.

How does worktree cleanup work after selecting a winning agent implementation?▼

Worktree cleanup after selecting a winning agent implementation involves removing the temporary session worktrees from your repository. This keeps the repository tidy once the winning branch is merged and losing branches are archived.

Can I explicitly choose which agent branch to merge instead of using the evaluation ranking?▼

Yes, you can explicitly choose which agent branch to merge. The Skill identifies the winning branch by using the latest evaluation ranking or by accepting an explicitly chosen agent to override the default selection.

Does merging multiple agent branches require a follow-up state transition?▼

Yes, merging multiple agent branches requires a follow-up state transition to merged. This state update occurs automatically after the no-ff merge and worktree cleanup are completed to finalize the session.

Related Skills

Explore More Software Engineering Skills→
dazzajidazzaji
9

competition

Coordinate three or more AI agents to generate solutions for a shared challenge.

Community
Advanced
jimmymalhanjimmymalhan
1

Post-Merge Watchdog

Automate post-merge branch cleanup, inventory refreshes, and regression checks.

Community
Advanced
majesticlabs-devmajesticlabs-dev
47

git-worktree

Manage Git worktrees for parallel development with centralized storage and cleanup.

Official
Advanced
lpjhelderlpjhelder

git-master

Create atomic Git commits with conventional formatting and manage repository history.

Community
Intermediate