skills.rest
SalesTeamToolbox
SalesTeamToolboxCOMMUNITY
Explore all skills by this author →
GitHub

git-workflow

Standardize Git branching, pull requests, commits, and merge conflict resolution.

Updated Aug 27, 2026
Search Tags:#git#pull request#conventional commits#branching strategy#interactive rebase#merge conflict resolution
One-click install
npx skills add https://github.com/SalesTeamToolbox/frood --skill git-workflow-salesteamtoolbox
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-workflow
Source: https://github.com/SalesTeamToolbox/frood/tree/main/skills/builtins/git-workflow
Command: npx skills add https://github.com/SalesTeamToolbox/frood --skill git-workflow-salesteamtoolbox

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This Skill helps you avoid messy branching, unclear PRs, and painful merge conflicts by giving a repeatable Git workflow for collaborating safely and keeping history readable.

Core Features & Use Cases

  • Branching strategies: Choose between trunk-based development, GitHub Flow, and Git Flow based on team size and release cadence.
  • PR and commit hygiene: Use conventions for PR size, descriptions, reviewer response, and Conventional Commits to improve review quality and traceability.
  • Conflict prevention and recovery: Follow a practical merge conflict resolution path and use interactive rebase and git bisect to fix and debug issues efficiently.
  • Use Case: Your team is working on multiple features at once and you need a consistent way to name branches, write PRs that reviewers can approve quickly, and keep the main branch usable after merges.

Quick Start

Use the git-workflow skill to create a GitHub Flow workflow for your team, including branch naming, PR best practices, and Conventional Commits.

Frequently Asked Questions about git-workflow

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

FAQPage Schema
What's the best way to structure a Git workflow for multiple features being developed simultaneously?▼

Merge conflict resolution follows a practical path of isolating the conflict, reviewing competing changes, and committing the resolved state. The skill provides actionable conflict resolution steps to fix issues efficiently while keeping history readable and reducing integration risk.

How do I use interactive rebase to clean up Git history before merging a pull request?▼

Interactive rebase cleans up Git history by squashing, reordering, or editing commits before merging a pull request. The skill provides history management rules to apply interactive rebasing for feature development and refactoring, ensuring readable and traceable commit logs.

When should I choose GitHub Flow over Git Flow for my branching strategy?▼

Choose GitHub Flow over Git Flow based on team size and release cadence. The skill helps you select between trunk-based development, GitHub Flow, and Git Flow, applying the appropriate branching strategy to balance feature development speed and release preparation stability.

How do I format Conventional Commits to improve pull request review quality?▼

Conventional Commits formatting improves pull request review quality by using structured commit messages that increase traceability. The skill provides conventions for PR size, descriptions, reviewer response, and commit formatting to help reviewers approve changes quickly.

Can I use git bisect to debug regressions while maintaining a standardized branching strategy?▼

Git bisect debugs regressions by systematically narrowing down the commit that introduced the bug. The skill integrates bisecting regressions into its workflow conventions, applying history management rules alongside branching strategies to debug issues efficiently without disrupting the main branch.

Related Skills

Explore More Software Engineering Skills→
LeroyAdonisLeroyAdonis

ship-it

Push the current branch to GitHub and open a pull request.

Community
Advanced
markus41markus41
1

gitworfkflows

Manage Git branching, commits, rebasing, and pull requests.

Community
Basic
jgezelscorpjgezelscorp

github-operations

Enforce branch naming, commit conventions, and manage GitHub issues and pull requests.

Community
Intermediate
figuedmundofiguedmundo

changelog-automation

Automate changelog generation and release management with Conventional Commits.

Community
Advanced