git-workflow

Manage Git merges, rebases, and commit history across branches.

1|Updated Feb 5, 2026

Search Tags:#git #history #rebase #branch #squash #version-control #merge-conflicts

Ready to run

npx skills add https://github.com/SeleznovIvan/claude-skills-test --skill git-workflow-seleznovivan

💬 Prompt for ChatGPT / Claude Chat▼

Please help me install this Agent Skill.
Skill: git-workflow
Source: https://github.com/SeleznovIvan/claude-skills-test/tree/main/.claude/skills/git-workflow
Command: npx skills add https://github.com/SeleznovIvan/claude-skills-test --skill git-workflow-seleznovivan

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Complex Git workflows, merge conflicts, and messy history slow down teams. This skill provides clear guidance for resolving conflicts, rebasing, squashing commits, and maintaining a clean, navigable history across branches.

Core Features & Use Cases

Resolve merge conflicts safely in collaborative repositories.
Perform interactive rebases to create a clean, linear history.
Squash commits before merging to reduce noise and improve PR clarity.
Cherry-pick specific commits or recover from mistakes with confidence.
Set up branch workflows and hooks to enforce consistent practices.

Quick Start

Explain how to resolve a current merge conflict and streamline the branch history.

Frequently Asked Questions about git-workflow

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

FAQPage Schema

How do I resolve merge conflicts safely in a collaborative Git repository?▼

To resolve merge conflicts safely, apply guided merge-resolution steps that manage conflicting changes across collaborative branches and maintain a clean, navigable history.

What is the best way to squash commits before merging a feature branch?▼

The best way to squash commits is using interactive rebase automation to combine changes, which reduces noise, improves PR clarity, and maintains a linear history.

How does interactive rebase work for cleaning up branch history?▼

Interactive rebase works by automating the reordering, squashing, and modification of commits, allowing you to perform a clean, linear history restructuring before merging.

Can I recover mistaken changes or cherry-pick specific commits from another branch?▼

Yes, you can cherry-pick specific commits and recover mistaken changes with confidence using provided workflow steps designed to manage history safely across collaborative repos.

How do I set up Git branch workflows and hooks to enforce consistent version-control practices?▼

You set up branch workflows and hooks to enforce consistent version-control practices, ensuring that merges, rebases, and history management follow standardized guidelines across the team.