skills.rest
ahuaracab
ahuaracabCOMMUNITY
Explore all skills by this author →
GitHub

git-flow-master

Detects branching strategies and executes branch, commit, push, PR, and conflict-resolution workflows.

Updated Aug 31, 2026
Search Tags:#git#pull request#conventional commits#conflict resolution#branching strategy#github cli#gitflow
One-click install
npx skills add https://github.com/ahuaracab/test-genesis --skill git-flow-master-ahuaracab
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-flow-master
Source: https://github.com/ahuaracab/test-genesis/tree/main/.agents/skills/git-flow-master
Command: npx skills add https://github.com/ahuaracab/test-genesis --skill git-flow-master-ahuaracab

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes references (resource) components.

What problem does it solve? Teams waste time and make costly mistakes when Git operations don't match their branching strategy — wrong PR bases, force-pushed shared history, or merge conflicts resolved blindly. This Skill auto-detects the repository's branching model and adapts every version-control action to it, persisting the decision so it never needs to be re-asked. ## Core Features & Use Cases - Strategy Detection & Persistence: Identifies eight strategies (solo-main, main-integration, enterprise, trunk-based, GitFlow, GitHub Flow, GitLab Flow, SDET integration-trunk) from git state and records the choice in the git_strategy: block of .agents/project.yaml. - Six Git Operations: Branch creation with conventional prefixes and issue keys, atomic conventional commits, policy-gated pushes, PR creation via gh pr create with rendered bodies, per-type conflict-resolution playbooks, and idempotent strategy bootstrapping. - Safety Guardrails: Never force-pushes without explicit opt-in, refuses direct pushes to protected branches when policy forbids them, verifies declared branch protection against actual GitHub rulesets, and never adds AI attribution to commits. - Use Case: A developer says "commit and push this work on UPEX-123" — the Skill reads repo state, groups changes into atomic conventional commits, confirms the push target, and offers to open a PR against the strategy-correct base branch. ## Quick Start Ask the assistant to commit your current changes and open a pull request, and it will detect the branching strategy and handle the full Git workflow.

Frequently Asked Questions about git-flow-master

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

FAQPage Schema
How do I create a branch and PR that matches my team's Git workflow?▼

The Skill detects your branching strategy from git state or the git_strategy block in .agents/project.yaml, then names the branch with the correct prefix and issue key, and targets the PR at the strategy-appropriate base branch such as staging or develop.

What branching strategies does git-flow-master support?▼

It supports eight strategies: solo-main, main-integration, enterprise, trunk-based, GitFlow, GitHub Flow, GitLab Flow, and an SDET integration-trunk model for chained test-automation suites. Detection runs automatically from branch layout, with a manual fallback prompt.

How do I resolve a Git merge conflict or rejected push safely?▼

The Skill diagnoses the situation first using git status and .git state files, then follows a per-type playbook covering merge conflicts, rebase conflicts, diverged pushes, detached HEAD, and stash conflicts. It presents options ranked by safety and never force-pushes or aborts silently.

Can I push directly to main or a protected branch?▼

It depends on the git_strategy.policy.direct_push_to_protected setting: allowed permits the push, confirm asks each time, and forbidden refuses and redirects to the PR flow. Admin bypass is only offered when policy explicitly enables it and is re-confirmed at runtime.

When should I not use git-flow-master?▼

Do not use it for testing tickets, authoring test cases in a TMS, writing automated tests, or running regression suites — those belong to dedicated testing skills. It operates strictly on the version-control layer: branches, commits, pushes, PRs, and conflicts.

How do I split a large change into smaller pull requests?▼

For diffs over roughly 400 lines, the Skill walks a decision tree: mechanical changes get a size-exception, linearly decomposable work becomes stacked PRs to the base branch, and shared-scaffolding changes use a feature-branch chain with a final integration PR.

Related Skills

Explore More Software Engineering Skills→
psw7205psw7205
1

git-diagnosis

Diagnoses codebase health by cross-analyzing Git history churn, bug clusters, and contributor activity.

Community
Intermediate
Nairon-AINairon-AI
7

flux-gate

Validate staging deployments and generate promotion pull requests.

Official
Advanced
pohlai88pohlai88

ship-pr

Runs lint and test gates, then opens a pull request from a branch.

Community
Intermediate
BAIZ1DBAIZ1D

writer

Create, convert, and batch process LibreOffice Writer documents via soffice and UNO API.

Community
Intermediate