skills.rest
sshekhar-04
sshekhar-04COMMUNITY
Explore all skills by this author →
Website𝕏@ShreyanshD44145GitHub

git-workflow

Guides git branching, conventional commits, conflict resolution, and pull request preparation.

Updated Sep 1, 2026
Search Tags:#git#version control#pull request#conventional commits#branching#merge conflicts#rebase
One-click install
npx skills add https://github.com/sshekhar-04/SIH_PS_26151 --skill git-workflow-sshekhar-04
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-workflow
Source: https://github.com/sshekhar-04/SIH_PS_26151/tree/main/.agents/Skills/git-workflow
Command: npx skills add https://github.com/sshekhar-04/SIH_PS_26151 --skill git-workflow-sshekhar-04

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve? Inconsistent commit messages, messy branch histories, and poorly handled merge conflicts slow down team collaboration. This Skill provides a structured, repeatable process for everyday git operations so every change follows professional version control standards. ## Core Features & Use Cases - Branching Strategy: Enforces a feature-branch workflow with clear naming conventions like feat/, fix/, and chore/ prefixes, keeping main protected. - Conventional Commits: Formats every commit message using the Conventional Commits specification (feat, fix, docs, refactor, and more) for readable, searchable history. - Conflict Resolution & PR Checklist: Walks through rebase-based syncing, conflict marker resolution, and a pre-merge checklist covering tests, linting, and clean history. - Use Case: When finishing a new login feature, use this Skill to create a feat/auth-jwt-login branch, stage and commit changes with a conventional message, rebase onto the latest main, resolve any conflicts, and verify the PR checklist before opening the pull request. ## Quick Start Ask the agent to create a feature branch, commit your current changes with a conventional commit message, and prepare the branch for a pull request.

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

Conventional commits follow the format type(optional scope): description. Use types like feat for new features, fix for bug fixes, docs for documentation, and refactor for code restructuring, for example feat(auth): implement JWT token generation.

How do I resolve git merge conflicts during a rebase?▼

Run git status to identify conflicting files, then inspect the conflict markers (<<<<<<<, =======, >>>>>>>) and resolve them logically. After testing the code, stage the resolved files with git add and run git rebase --continue.

What branch naming convention should I use for features and fixes?▼

Use feat/<short-description> for new features, fix/<short-description> for bug fixes, and chore/ or refactor/ prefixes for maintenance work. Keep main or master reserved for production-ready code and never commit directly to it.

Should I use git pull --rebase or merge when syncing with main?▼

This workflow recommends git fetch origin followed by git pull --rebase origin main to keep a linear history. Rebase replays your commits on top of the latest main, avoiding unnecessary merge commits before opening a pull request.

What should I check before creating a pull request?▼

Verify that all unit and integration tests pass, the code is formatted and linted, and no debug logs, secrets, or temporary files are committed. Also ensure the commit history is meaningful without repetitive fix-up commits.

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
taracodlabstaracodlabs
799

github-pr-workflow

Manages the full GitHub pull request lifecycle using the gh CLI.

Official
Intermediate
Devsoul2026Devsoul2026
150

requesting-code-review

Automate pre-commit verification with static analysis, tests, and lint checks.

Community
Advanced
hung-phanhung-phan

trunk-based-development

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

Community
Advanced