skills.rest
vstorm-co
vstorm-coOFFICIAL
Explore all skills by this author →
WebsiteGitHub

git-workflow

Manage git commits, branches, pull requests, and conflict resolution.

1.0k|120|Updated Nov 29, 2025
Search Tags:#git#workflow#commits#branches#conflict-resolution#pull-requests#version-control
One-click install
npx skills add https://github.com/vstorm-co/pydantic-deepagents --skill git-workflow-vstorm-co
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-workflow
Source: https://github.com/vstorm-co/pydantic-deepagents/tree/main/cli/skills/git-workflow
Command: npx skills add https://github.com/vstorm-co/pydantic-deepagents --skill git-workflow-vstorm-co

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This skill provides clear, repeatable guidance to produce consistent git commits, branch workflows, pull requests, and to safely resolve merge conflicts, reducing broken builds and risky history edits.

Core Features & Use Cases

  • Commit message convention: Use <type>: <description> with types like feat, fix, refactor to make history readable.
  • Branch workflow: Create feature branches from main, make small focused commits, push and open PRs, then squash-merge after review.
  • Conflict resolution: Steps to fetch, rebase onto origin/main, resolve conflicts deliberately, test, and continue rebase or merge flow.
  • Safety rules: Avoid force-pushing to main, never commit secrets, check git diff before committing, and stash uncommitted work before switching branches.
  • Use Case: A developer preparing a feature for review can follow these rules to produce a compact, reviewable history and avoid accidental regressions.

Quick Start

Create a feature branch from main, commit changes with a message like feat: add user login following the described format, rebase onto origin/main to resolve conflicts, and open a pull request for review.

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 git commit message that follows standard conventions?▼

Standard git commit messages use the format <type>: <description>, where type is feat, fix, or refactor. This makes history readable and consistent across team-based development workflows.

What's the best way to resolve git merge conflicts during a rebase?▼

To resolve git merge conflicts, fetch latest changes, rebase onto origin/main, deliberately resolve conflicts, test the code, and then continue the rebase or merge flow to finalize the history.

How do I create a feature branch workflow for pull requests?▼

Create feature branches from main, make small focused commits, push the branch, and open a pull request. After code review, use squash-merge to maintain a compact, reviewable history.

What are the safety rules for force-pushing to main?▼

Avoid force-pushing to main entirely. Additional git safety rules include never committing secrets, checking git diff before committing, and stashing uncommitted work before switching branches.

When do I need to stash uncommitted work before switching branches?▼

Stash uncommitted work before switching branches to prevent accidental regressions and keep your working directory clean. Always check git diff before committing to ensure only intended changes are included.

Does this git workflow support collaborative rebases and code reviews?▼

Yes, this git workflow applies to team-based software development involving feature branches, code reviews, and collaborative rebases, enforcing safe merge strategies and conflict resolution steps.

Related Skills

Explore More Software Engineering Skills→
helderbertohelderberto
114

amend-push

Amend the previous commit and push changes to a remote repository.

Community
Basic
TencentCloudBaseTencentCloudBase
1.1k

pr-review-fix

Analyze and resolve CI failures, review feedback, and merge conflicts across open GitHub pull requests.

Official
Advanced
lengoctuong2005lengoctuong2005
5

requesting-code-review

Automate pre-commit code review with security scans, tests, and fixes.

Community
Advanced
117503445117503445
2

commit

Standardize Git commits by reviewing staged changes and sensitive information.

Community
Basic