Branch Workflow & Merge Queue Skill

Manage Git branching, pull requests, and automated merging via CI pipelines.

3|Updated Mar 13, 2026
One-click install
npx skills add https://github.com/Totes-MickGOATs/mcgoats-game-template --skill branch-workflow-merge-queue-skill
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: Branch Workflow & Merge Queue Skill
Source: https://github.com/Totes-MickGOATs/mcgoats-game-template/tree/main/.agents/skills/branch-workflow
Command: npx skills add https://github.com/Totes-MickGOATs/mcgoats-game-template --skill branch-workflow-merge-queue-skill

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes references (resource) components.

What problem does it solve?

This Skill streamlines the process of developing, committing, pushing, and merging code, ensuring a clean and efficient Git workflow while preventing direct commits to the main branch.

Core Features & Use Cases

  • Isolated Worktrees: Create isolated development environments for each task, ensuring the latest code from main is always used.
  • Automated PRs & CI: Guides users through creating pull requests and waiting for Continuous Integration checks to pass.
  • Event-Driven Merge Queue: Manages an automated merge queue that handles rebasing and merging once CI is green.
  • Use Case: A developer needs to add a new feature. They use the skill to create a worktree, develop the feature with frequent commits, push to a feature branch, create a PR, and the skill ensures it goes through CI and the merge queue without manual intervention.

Quick Start

Use the branch workflow skill to create a new feature branch for adding a user profile page.

Frequently Asked Questions about Branch Workflow & Merge Queue Skill

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

FAQPage Schema
How do I prevent direct commits to the main branch in a Git workflow?

Preventing direct commits to your main branch requires a strict Git workflow with multiple layers of protection. This Skill enforces this by guiding development through isolated worktrees and automated pull request creation before any code merges.

What is the best way to automate a Git merge queue with CI pipelines?

Automating a Git merge queue involves managing an event-driven process that handles rebasing and merging once CI checks pass. This Skill manages the queue automatically, ensuring merges only happen when Continuous Integration pipelines are green.

How do I use Git worktrees to isolate feature development from the main branch?

Using Git worktrees creates isolated development environments for each task, ensuring you always start with the latest code from main. This Skill automatically sets up these worktrees to keep feature development separated and clean.

What happens if CI fails or merge conflicts occur during an automated pull request merge?

When CI failures or merge conflicts occur during an automated pull request merge, the process halts to prevent broken code integration. This Skill handles these failures directly and provides emergency procedures for resolving critical situations.

Can I use an automated merge queue for my existing CI/CD development process?

Yes, you can integrate an automated merge queue into your existing CI/CD development process. The Skill manages event-driven merge queues that handle rebasing and merging automatically once your Continuous Integration checks pass.

Do I need any specific Git extensions or dependencies to manage worktrees and pull requests?

No specific Git extensions or dependencies are required to manage worktrees and pull requests with this Skill. It operates independently using standard Git branching, committing, and CI pipeline configurations to enforce the development process.