skills.rest
jvsandhu
jvsandhuCOMMUNITY
Explore all skills by this author →
GitHub

git_workflow

Guides branch strategies, conventional commits, and merge conflict resolution in Git.

Updated Jan 14, 2026
Search Tags:#git#workflow#code review#version control#conventional commits#branching#merge conflict
One-click install
npx skills add https://github.com/jvsandhu/agentic-skills --skill git-workflow-jvsandhu
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git_workflow
Source: https://github.com/jvsandhu/agentic-skills/tree/main/skills/git_workflow
Command: npx skills add https://github.com/jvsandhu/agentic-skills --skill git-workflow-jvsandhu

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve? Teams often struggle with inconsistent branch naming, messy commit histories, and painful merge conflicts. This Skill provides a structured Git workflow covering branching strategies, commit conventions, and conflict resolution so your repository history stays clean and your main branch stays deployable. ## Core Features & Use Cases - Branching Strategies: Compare Git Flow, GitHub Flow, and Trunk Based Development with standardized branch naming prefixes like feature/, fix/, and hotfix/. - Conventional Commits: Enforce the type(scope): description format (feat, fix, refactor, chore) with rules for atomic commits and clear messages. - Merge & Conflict Resolution: Guidance on merge vs rebase vs squash merge, plus step-by-step conflict resolution and abort procedures. - Use Case: A developer finishing a feature branch can follow the checklist to squash-merge into main, write a compliant commit message like feat(auth): add OAuth2 login support, and delete the branch afterward. ## Quick Start Ask the agent to review your current Git branching and commit practices and recommend a workflow following the git_workflow conventions.

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 commit message?▼

Use the format `type(scope): description`, such as `feat(auth): add OAuth2 login support`. Common types include feat, fix, docs, refactor, perf, test, and chore. Keep the title under 50 characters, use imperative mood, and add a body explaining why the change was made.

When should I use merge vs rebase in Git?▼

Use merge for public or shared branches to preserve history, and rebase for local feature branches to keep a linear history. When merging a feature into main, prefer squash merge to keep the main branch history clean and readable.

How do I resolve a Git merge conflict?▼

Run `git status` to see conflicted files, edit them to remove the `<<<<<<<`, `=======`, and `>>>>>>>` markers, then stage the resolved files with `git add`. Finish with `git merge --continue` or `git rebase --continue`, or abort entirely with `git merge --abort`.

What is the difference between Git Flow and GitHub Flow?▼

Git Flow uses long-lived develop and release branches suited for scheduled releases, while GitHub Flow keeps a single always-deployable main branch with short-lived feature branches. GitHub Flow is recommended for simpler, continuous deployment workflows.

How do I undo a Git commit without losing changes?▼

Use `git reset --soft HEAD~1` to undo the last commit while keeping all changes staged. To discard the commit and its changes entirely, use `git reset --hard HEAD~1`, or use `git revert <hash>` to safely create a new commit that reverses it.

Related Skills

Explore More Software Engineering Skills→
KamiJeongKamiJeong

speckit-git-remote

Detect a Git remote URL and extract owner, repository name, and GitHub status.

Community
Basic
RoxabiRoxabi
9

promote

Automate staging-to-main branch promotion with pre-flight checks, versioning, and pull request creation.

Official
Advanced
cartridge-ggcartridge-gg
80

pre-commit-check

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

Official
Intermediate
KrosebrookKrosebrook

Git Advanced Workflow Expert

Automates Git workflows for trunk-based development and monorepo management.

Community
Intermediate