Guide stacked-branch workflows with Git Town commands for create, sync, and ship.
npx skills add https://github.com/gtheys/opencode --skill git-town-gtheys
Please help me install this Agent Skill. Skill: git-town Source: https://github.com/gtheys/opencode/tree/main/global/skills/git-town Command: npx skills add https://github.com/gtheys/opencode --skill git-town-gtheys
Guides teams to manage complex git workflows by using Git Town's stacked-branch system, reducing manual rebase pain and merge conflicts.
Install Git Town, initialize your repo with git town init, then start and manage stacked branches using git town hack, git town append, and git town sync, resolving conflicts with git town continue when needed.
High-intent search queries and answers about installing and using this skill.
Stacked branches let you build features on top of each other, and Git Town automates the rebasing and syncing. You can create and organize stacks using git town hack, append, and prepend to keep dependent branches synchronized.
When merge conflicts occur during a git town sync, you resolve them manually and then run git town continue to resume the process. This command picks up where the sync left off after you fix the conflicting files.
To ship a completed feature, use git town ship to move your finished work toward the main branch and pull requests. This handles the branch deletion and restacking of any dependent branches above it.
Yes, Git and Git Town must be installed before you can use this workflow. You initialize your repository with git town init to configure the stacked branch settings before creating branches.
Yes, you can use git town prepend to insert a new branch at the bottom of an existing stack. This rebases the subsequent dependent branches onto the newly created branch automatically.
Rebasing a stacked branch changes its commit history, which can cause conflicts in dependent branches built on top. Git Town syncs and restacks these branches automatically, using git town continue to resolve any conflicts.
mindfu23Automate Git workflow with pre-commit checks, branch creation, and pull request generation.
iadr-devEnforce a pre-merge checklist for Git branches and generate changelog and PR descriptions.
tribedotrunCreate GitHub pull requests and trigger AI reviewers with CI monitoring.
dtsongAnalyze Git conflict markers and guide resolution with checkout commands.
