skills.rest
edwifiguy
edwifiguyCOMMUNITY
Explore all skills by this author →
GitHub

git-workflow

Enforce best practices for commits, branches, merges, and pull requests.

1|Updated Apr 11, 2026
Search Tags:#git#workflow#branching#commits#code-review#pull-requests#version-control
One-click install
npx skills add https://github.com/edwifiguy/era-agents-ops --skill git-workflow-edwifiguy
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-workflow
Source: https://github.com/edwifiguy/era-agents-ops/tree/main/skills/era-agents-op/metaclaw/memory_data/skills/git-workflow
Command: npx skills add https://github.com/edwifiguy/era-agents-ops --skill git-workflow-edwifiguy

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Git workflows can be error-prone and time-consuming when managing commits, branches, merges, and pull requests. This skill provides best practices to keep history clean and collaboration safe.

Core Features & Use Cases

  • Branching strategies and commit hygiene to maintain a readable history.
  • Pull request etiquette, code review guidance, and conflict resolution tips.
  • Safe governance for merges, rebasing, and squashing when appropriate.

Quick Start

Create a feature branch from main, commit changes with clear messages, and open a pull request with a concise description.

Frequently Asked Questions about git-workflow

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

FAQPage Schema
What is the best way to structure git commits and branches for a clean version control history?▼

The best way to structure git commits and branches is to use clear commit messages and structured branching strategies. This maintains a readable history and ensures safe collaboration across development teams.

How do I resolve merge conflicts during a pull request code review?▼

To resolve merge conflicts during a pull request, apply targeted conflict resolution tips and follow pull request etiquette. This ensures safe governance when merging divergent branches back into the main codebase.

When should I use rebase or squash instead of a standard merge in git?▼

You should use rebase or squash instead of a standard merge when you need to consolidate commits and maintain a linear history. Applying these safe governance strategies keeps your version control history clean.

Does this git workflow guidance apply to individual developers or only team-based version control?▼

This git workflow guidance applies to both individual developers and teams. It scales safely for anyone performing commits, branching, and pull request reviews across various Git platforms.

How do I write a pull request description for a feature branch?▼

To write a pull request description, create a feature branch from main, commit changes with clear messages, and open a pull request with a concise summary. This enforces best practices for code review.

Related Skills

Explore More Software Engineering Skills→
Tx1207Tx1207
5

project-creator

Create a new project from a template, initialize uv, and configure a local Git repository.

Community
Advanced
jimmymalhanjimmymalhan
1

rebase-manager

Rebase dependent pull request branches onto main after a base PR merges.

Community
Intermediate
lengoctuong2005lengoctuong2005
5

requesting-code-review

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

Community
Advanced
RepairYourTechRepairYourTech
6

git-workflow

Standardize Git workflows with conventional commits and branching strategies.

Community
Intermediate