Can I still use raw Git for committing changes?

Yes, this skill encourages using standard Git commands for 'add' and 'commit' operations, while reserving Git-Town for branch lifecycle management and synchronization.

Does this skill support stacked branches?

Yes, it includes advanced commands like 'append', 'up', and 'down' to create, navigate, and manage complex stacks of dependent feature branches efficiently.

What happens if there is a merge conflict during a sync?

The workflow detects conflicts, prompts the user to resolve them manually, and then provides a structured path to continue the automated process using the 'git town continue' command.

Why use Git-Town instead of raw Git commands?

Git-Town provides higher-level abstractions that automate repetitive tasks like syncing with upstream, managing branch hierarchies, and cleaning up tracking branches after merges, reducing manual errors.

How does 'git town ship' differ from a standard merge?

It automates the final steps of a contribution: verifying PR approval, merging to the main branch, deleting both local and remote feature branches, and updating your local main branch in one atomic operation.

Git-Town Contribution Workflow

Name: Git-Town Contribution Workflow
Author: terrylica

byterrylica

•

开发者工具

Automates the full software contribution lifecycle using Git-Town for structured branching, synchronization, and shipping.

This skill provides a standardized, high-level workflow for contributing code using Git-Town, ensuring consistent branch management and synchronization across your development environment. It guides developers through the entire process—from creating feature branches with 'git town hack' and syncing with upstream to proposing pull requests and shipping approved changes. By enforcing Git-Town commands over raw Git, it prevents common branching errors, simplifies conflict resolution, and natively supports advanced patterns like stacked branches, making it ideal for teams following structured trunk-based or feature-branch development models.

主要功能

01Automated feature branch creation with mandatory upstream synchronization

02One-command shipping that handles merging, branch deletion, and local cleanup

03High-level pull request management using 'git town propose' with draft support

04Support for complex stacked branch hierarchies and navigation

0524 GitHub stars

06Integrated preflight checks for fork configurations and workspace hygiene

使用场景

01Standardizing the contribution process across a distributed development team to reduce merge errors

02Automating the tedious cleanup of local and remote branches after a pull request is merged

03Managing complex dependencies between multiple related feature branches using stacked workflows

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add terrylica/cc-skills contribute

For use in Claude.ai and ChatGPT