skills.rest
ESO-Toolkit
ESO-ToolkitOFFICIAL
Explore all skills by this author →
GitHub

git

Manage stacked Git branches with Twig and plain Git commands.

2|Updated Aug 18, 2025
Search Tags:#git#workflow#collaboration#version control#branching#twig
One-click install
npx skills add https://github.com/ESO-Toolkit/eso-toolkit --skill git-eso-toolkit
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git
Source: https://github.com/ESO-Toolkit/eso-toolkit/tree/main/.github/skills/git
Command: npx skills add https://github.com/ESO-Toolkit/eso-toolkit --skill git-eso-toolkit

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes references (resource) components.

What problem does it solve?

This Skill streamlines complex Git workflows, especially for projects using stacked or dependent branches, ensuring consistency and efficient collaboration.

Core Features & Use Cases

  • Stacked Branch Management: Create, manage, and visualize dependent branches using Twig or plain Git.
  • Worktree Awareness: Safely manage multiple branches checked out simultaneously.
  • Automated Cascading: Propagate changes across dependent branches automatically.
  • Use Case: When working on a feature that depends on another ongoing feature, this Skill helps you create your branch correctly, keep it updated with parent changes, and ensure all related branches are synchronized before merging.

Quick Start

Use the git skill to create a new branch named 'ESO-123/my-new-feature' depending on the 'main' branch.

Frequently Asked Questions about git

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

FAQPage Schema
How do I manage stacked Git branches when one feature depends on another?▼

Stacked Git branch management lets you create, visualize, and propagate changes across dependent branches automatically. This ensures parent and child feature branches remain synchronized and correctly ordered before final merging.

What is the best way to keep a dependent Git branch updated with its parent branch?▼

Automated cascading propagates upstream changes across dependent branches automatically. This ensures that when a parent branch receives updates, all child branches stacked on top of it are immediately synchronized without manual rebase conflicts.

Can I use multiple Git worktrees simultaneously without breaking branch dependencies?▼

Yes, worktree awareness safely manages multiple branches checked out simultaneously across different directories. This prevents dependency conflicts and structural corruption when you are actively working on several stacked branches in parallel.

How do I automate Jira ticket status updates through Git branch naming conventions?▼

Automated Jira ticket status updates are triggered by matching specific branch naming conventions during Git operations. By naming your branch with the corresponding ticket ID, workflow transitions are synced automatically as the branch progresses.

Do I need the Twig tool to manage stacked branch workflows or can I use plain Git?▼

You do not need Twig exclusively; the workflow falls back to plain Git commands for branch creation and dependency management. Twig is supported for enhanced stacked branch management, but standard Git commands remain fully functional.

How can I visualize branch dependencies in a stacked Git workflow?▼

Visualizing branch dependencies maps the parent-child relationships across your stacked Git branches. This clarifies the merge order and displays the exact cascading impact, ensuring structural integrity before you integrate dependent features.

Related Skills

Explore More Software Engineering Skills→
cenmiaocenmiao

openspec-sp-git-worktree

Create isolated Git worktrees with branch naming and baseline tests.

Community
Intermediate
jimmymalhanjimmymalhan
1

rebase-manager

Rebase dependent pull request branches onto main after a base PR merges.

Community
Intermediate
mt-krainskimt-krainski
1

workflow

Manage Jira issue transitions, branch creation, and pull requests.

Community
Advanced
arittrarittr
19

using-git-spice

Manage stacked Git branches and Change Requests with git-spice commands.

Community
Advanced