Git Workflows

Manage local Git repository operations via PowerShell scripts.

1|1|Updated Feb 21, 2026

Search Tags:#git #workflow #version control #branching #conflict resolution #merging

Ready to run

npx skills add https://github.com/dtsong/claude-code-windows-setup --skill git-workflows-dtsong

💬 Prompt for ChatGPT / Claude Chat▼

Please help me install this Agent Skill.
Skill: Git Workflows
Source: https://github.com/dtsong/claude-code-windows-setup/tree/main/skills/git-workflows
Command: npx skills add https://github.com/dtsong/claude-code-windows-setup --skill git-workflows-dtsong

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes scripts (resource) and references (resource) components.

What problem does it solve?

This Skill provides a comprehensive set of tools to manage your local Git repository, ensuring efficient and clean version control practices.

Core Features & Use Cases

Syncing & Branching: Easily fetch, pull, push, create, switch, and delete branches.
Conflict Resolution: Get guided help to resolve merge and rebase conflicts.
History Management: Squash commits for a cleaner history.
Use Case: You've made several small commits on a feature branch and want to clean them up before creating a Pull Request. Use /git-squash to combine them into a single, logical commit.

Quick Start

Run the git sync skill to fetch remote changes and see what's new upstream.

Frequently Asked Questions about Git Workflows

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

FAQPage Schema

How do I resolve merge and rebase conflicts in a local Git repository?▼

To resolve merge and rebase conflicts in a local Git repository, this tool provides guided assistance for safe code integration. It helps you navigate complex conflict resolution scenarios to ensure clean branch merging.

What is the best way to squash commits before creating a pull request?▼

The best way to squash commits before creating a pull request is using dedicated Git workflow scripts. This combines several small feature branch commits into a single, logical commit for a cleaner history.

How do I manage local branch syncing and switching?▼

You can manage local branch syncing and switching through deterministic PowerShell scripts. These scripts execute common Git workflows to easily fetch, pull, push, create, switch, and delete branches.

Does this Git workflow tool require any external dependencies?▼

This Git workflow tool requires no external dependencies to manage local repository operations. It relies solely on built-in PowerShell scripts to execute deterministic version control tasks.

When do I need to stash changes during version control operations?▼

You need to stash changes during version control operations when you want to temporarily save modifications without committing them. This tool manages stashing alongside branching and merging to maintain a clean working directory.