skills.rest
Yash-Awasthi
Yash-AwasthiCOMMUNITY
Explore all skills by this author →
GitHub

git-workflow-strategy

Configure Git branching strategies, merge patterns, and code review workflows for team collaboration.

Updated Aug 28, 2026
Search Tags:#git#code review#version control#merge#branching strategy#trunk-based development#gitflow
One-click install
npx skills add https://github.com/Yash-Awasthi/adapfit --skill git-workflow-strategy-yash-awasthi
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-workflow-strategy
Source: https://github.com/Yash-Awasthi/adapfit/tree/main/.agents/skills/git-workflow-strategy
Command: npx skills add https://github.com/Yash-Awasthi/adapfit --skill git-workflow-strategy-yash-awasthi

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes scripts (resource) and references (resource) components.

What problem does it solve? Teams struggle to choose and consistently apply a Git branching model, leading to messy histories, unreviewed merges, and unclear release or hotfix procedures. ## Core Features & Use Cases - Branching Strategy Setup: Implement GitFlow, GitHub Flow, or Trunk-Based Development with concrete command sequences for features, releases, and hotfixes. - Merge Strategy Automation: Apply squash, rebase, or no-ff merge strategies via a parameterized shell script. - Collaboration Patterns: Enforce branch naming conventions, code review flows, and Git configuration for team environments. - Use Case: A team lead standardizing a repository can initialize GitFlow, define branch naming rules, and require pull request reviews before merging to main. ## Quick Start Set up a GitFlow workflow for my repository with feature, release, and hotfix branches including naming conventions.

Frequently Asked Questions about git-workflow-strategy

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

FAQPage Schema
How do I set up GitFlow in an existing repository?▼

Run git flow init -d to initialize GitFlow with default branch names, then use git flow feature start, release start, and hotfix start commands to manage work. Finish each branch with the corresponding finish command to merge and tag.

GitFlow vs GitHub Flow vs Trunk-Based Development: which should I choose?▼

GitFlow suits scheduled releases with multiple versions, GitHub Flow fits continuous deployment from a single main branch, and Trunk-Based Development works for small frequent commits with feature flags. Match the workflow to team size and release cadence.

How do I merge a branch with squash or rebase strategy?▼

Use the merge-with-strategy.sh script with a branch name and strategy argument: squash combines all commits into one, rebase replays commits linearly, and merge uses --no-ff to preserve branch history. The script updates main, merges, pushes, and deletes the branch.

What branch naming conventions should a team use?▼

Use type prefixes like feature/, bugfix/, hotfix/, release/, and chore/ followed by a descriptive name or ticket ID, such as feature/JIRA-123-payment-integration. Avoid vague names like dev, test, or temp.

When should I avoid long-lived feature branches?▼

Keep feature branches under three days to minimize merge conflicts and integration risk. Rebase frequently on main and split large work into smaller atomic commits instead of maintaining long-running branches.

Related Skills

Explore More Software Engineering Skills→
dyoshikawadyoshikawa
1

diff-analyze

Analyze git differences and commit history between the current branch and origin main.

Community
Basic
amo-tech-aiamo-tech-ai

cicd-pipeline

Automate GitHub Actions CI/CD pipelines for build, test, lint, and deployment workflows.

Community
Intermediate
logo-solutionslogo-solutions

git-workflow-and-versioning

Enforce disciplined git workflows for committing, branching, merging, and resolving conflicts.

Official
Advanced
KrosebrookKrosebrook

Git Advanced Workflow Expert

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

Community
Intermediate