skills.rest
tamagusko
tamaguskoCOMMUNITY
Explore all skills by this author →
WebsiteGitHub

git-workflow

Provides Git workflow standards covering Conventional Commits, branching strategies, merges, and conflict resolution.

Updated Oct 7, 2022
Search Tags:#git#code review#version control#conventional commits#semantic versioning#merge conflict#branching strategy
One-click install
npx skills add https://github.com/tamagusko/linux-cfg --skill git-workflow-tamagusko
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-workflow
Source: https://github.com/tamagusko/linux-cfg/tree/main/dotfiles/claude/skills/git-workflow
Command: npx skills add https://github.com/tamagusko/linux-cfg --skill git-workflow-tamagusko

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes references (resource) components.

What problem does it solve? Teams often struggle with inconsistent commit messages, chaotic branch management, and painful merge conflicts. This Skill enforces standardized Git practices so collaboration stays traceable, reviews stay structured, and releases follow a repeatable process. ## Core Features & Use Cases - Conventional Commits enforcement: Standardized commit message format with types like feat, fix, docs, and refactor, plus scope, body, and footer rules. - Branching strategy guidance: Defines master/develop/feature/bugfix/hotfix/release branch lifecycles, naming conventions, and protection rules. - Workflow playbooks: Step-by-step command sequences for daily development, hotfix, and release workflows, plus merge vs rebase guidance and conflict resolution procedures. - Use Case: When a developer asks how to ship an urgent production fix, the Skill walks through creating a hotfix branch from master, merging with --no-ff, tagging a semantic version, and syncing back to develop. ## Quick Start Ask the assistant to create a Conventional Commits message and the correct branch workflow for your current change.

Frequently Asked Questions about git-workflow

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

FAQPage Schema
How do I write a Conventional Commits message?▼

Use the format type(scope): subject, where type is feat, fix, docs, refactor, perf, test, or chore. Start the subject with a verb, keep it under 50 characters, and omit the trailing period. Add a body and footer for breaking changes or issue references.

What Git branching strategy should a team use?▼

Use permanent master and develop branches plus short-lived feature, bugfix, hotfix, and release branches. Feature branches merge into develop via pull request, and releases merge into master with an annotated semantic version tag.

Should I use git merge or git rebase?▼

Use rebase to sync a private feature branch with the latest develop code, and use merge --no-ff when merging branches into develop or master to preserve history. Never rebase public shared branches since it rewrites history.

How do I resolve a Git merge conflict?▼

Run git status to find conflicted files, edit the conflict markers manually, then git add the files and commit for a merge or run git rebase --continue for a rebase. Use git merge --abort or git rebase --abort to cancel the operation entirely.

When should I use git revert instead of git reset?▼

Use git revert to undo a commit that has already been pushed, since it creates a new inverse commit and preserves history. Use git reset --hard only for local unpushed commits, because it discards subsequent commits permanently.

Related Skills

Explore More Software Engineering Skills→
jacksonlee-twjacksonlee-tw

git-workflow

Automates Git feature branch creation, Conventional Commit staging, and GitLab push workflows.

Community
Intermediate
nebiusnebius
7

publish-release

Publishes versioned package releases to GitHub Releases with changelog prep, tagging, and asset verification.

Official
Advanced
cartridge-ggcartridge-gg
80

pre-commit-check

Run Husky pre-commit hooks for format, lint, and test checks.

Official
Intermediate
hung-phanhung-phan

trunk-based-development

Implement a trunk-based development workflow with short-lived branches and feature flags.

Community
Advanced