skills.rest
marcocpt
marcocptCOMMUNITY
Explore all skills by this author →
GitHub

dd-git-workflow

Defines Git branching model and merge-only workflow rules for AI-assisted multi-branch development.

Updated Jun 11, 2026
Search Tags:#git#workflow#branching#worktree#merge#conflict resolution#ai coding
One-click install
npx skills add https://github.com/marcocpt/trae_skills --skill dd-git-workflow-marcocpt
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: dd-git-workflow
Source: https://github.com/marcocpt/trae_skills/tree/main/dd-git-workflow
Command: npx skills add https://github.com/marcocpt/trae_skills --skill dd-git-workflow-marcocpt

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve? When multiple AI coding agents (Cursor, Codex, Claude Code, Trae) work in parallel on the same repository, branches drift, conflicts pile up, and merges become risky. This Skill provides a single entry point that defines the branch model, core principles, and navigation to specialized sub-skills so every agent follows the same Git discipline. ## Core Features & Use Cases - Three-Layer Branch Model: Enforces a main / develop / feature-fix-docs-refactor hierarchy with strict naming conventions like feature/F3.1-ocr-acceleration. - Merge-Only Principles: Mandates daily merge actions, one feature per branch, and --no-ff merges while prohibiting long-term rebase on shared branches. - Sub-Skill Navigation: Routes to dedicated skills for branching, merging, conflict handling, worktrees, health checks, cleanup, and CI pre-merge checks, each producing structured JSON reports. - Use Case: An AI agent about to start a new feature consults this Skill to learn the correct branch naming, then follows the linked sub-skills to create a worktree, run daily syncs, and pass the pre-merge checklist before merging into develop. ## Quick Start Ask the AI to explain the Git workflow and which sub-skill to use for creating a new feature branch in this repository.

Frequently Asked Questions about dd-git-workflow

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

FAQPage Schema
How do I manage Git branches when multiple AI coding agents work in parallel?▼

Use a three-layer model with main, develop, and per-task branches like feature/F3.1-ocr-acceleration. Each agent gets its own branch, merges into develop daily, and uses merge instead of rebase on shared branches.

What Git branch naming convention should AI coding workflows use?▼

Use prefixed formats: feature/{F-number}-{description}, fix/{F-number}-{description}, docs/{topic}, and refactor/{module}. Keep descriptions lowercase with hyphens, avoid underscores and spaces, and stay under 50 characters.

Should I use merge or rebase for AI-assisted development branches?▼

Prefer merge over rebase for shared AI coding branches. Feature merges must use --no-ff to preserve branch history, and frequently rebasing shared branches is explicitly prohibited.

How often should feature branches merge back into develop?▼

Every branch must perform a merge action daily, not just sync. A branch left unmerged for more than one day is considered stale, and branches touching shared files must merge within one day.

What checks are required before merging a feature branch?▼

Run the pre-merge check script which outputs a PreMergeChecklist JSON. If the all_pass field is false, the merge must be blocked until the failing items are resolved.

Can one git worktree be shared across multiple branches?▼

No. Each worktree belongs to exactly one branch, and sharing a worktree across branches is explicitly prohibited to prevent cross-branch contamination of the working directory.

Related Skills

Explore More Software Engineering Skills→
moberghrmoberghr
6

using-git-worktrees

Create and manage git worktrees with branch naming and baseline tests.

Official
Intermediate
LuminairPrimeLuminairPrime

pull

Synchronize a local branch with origin/main and resolve merge conflicts.

Community
Intermediate
nitranitra

n-doc-files

Generates concise Ukrainian behavioral markdown documentation for changed code files.

Official
Basic
hung-phanhung-phan

trunk-based-development

Implement a trunk-based development workflow with short-lived branches and feature flags.

Community
Advanced