managing-git_skill

This skill helps you manage Git workflows, create atomic commits, handle branches, and open PRs with best practices.

Python

1.2k

GitHub Stars

1

Bundled Files

2 months ago

Catalog Refreshed

4 months ago

First Indexed

Readme & install

Copy the install command, review bundled files from the catalogue, and read any extended description pulled from the listing source.

Installation

Preview and clipboard use veilstrat where the catalogue uses aiagentskills.

npx veilstrat add skill cloudai-x/claude-workflow-v2 --skill managing-git

SKILL.md4.5 KB

Overview

This skill manages Git workflows including branching, commits, pull requests, and common recovery actions. It provides practical checklists, branch naming conventions, commit message formats, and everyday Git commands to keep history clean and reviews fast. Use it to enforce consistent version control practices across feature work and releases.

How this skill works

The skill inspects workflow needs and recommends actions: create feature branches, craft atomic commits, rebase on main, and open PRs with a checklist. It suggests branching strategies (GitHub Flow vs Git Flow), conventional commit formats, and PR templates. It also provides common commands for daily work and fixes like amend, reset, revert, and interactive rebase.

When to use it

Starting a new feature or bug fix branch
Preparing commits and cleaning history before pushing
Opening a pull request or preparing a PR description
Resolving merge conflicts or rebasing onto main
Choosing a branching strategy for a project
Recovering from mistaken commits or broken builds

Best practices

Branch from main for small, deployable changes (GitHub Flow) or use develop/release branches for release-driven projects (Git Flow)
Use Conventional Commits: type(scope): short description, include body and footers when needed
Make atomic commits: one logical change per commit and keep messages descriptive
Rebase on the latest main before pushing to reduce merge conflicts and keep history linear
Run commit validation: clear messages, correct type, no secrets, and no WIP commits
Keep PRs appropriately sized; split very large changes and include tests and a clear why in the description

Example use cases

Create a feature branch, make several small commits, rebase on main, squash with interactive rebase, and open a PR
Follow PR checklist and template to ensure tests and documentation are included before merge
Recover from a bad pushed commit by reverting or using reset locally followed by force-push with caution
Use git bisect to find failing commits during regression testing
Cherry-pick a bug fix commit into a release branch without merging all feature work

FAQ

Use test(scope): description for changes that only add or update tests.

When should I rebase vs merge from main?

Rebase to keep a linear history and resolve conflicts locally before PR. Merge is fine for preserving historical merge context or when following a non-linear workflow.