Git Workflows

Real file from a public repo · synced Aug 22, 2026

git-flow-master

End-to-end Git operator for any branching strategy. Auto-detects the project's strategy (solo-main, main+integration, enterprise multi-branch, trunk-based, GitFlow, GitHub Flow, GitLab Flow, SDET integration-trunk for chained test-automation suites) from .git config, branches, and the git_strategy: block in .agents/project.yaml, then adapts every commit, branch, push, PR, conflict-fix, and chained-PR action to that strategy. Use this skill whenever the user wants to: create a branch (crear branch, new feature branch, start work on UPEX-123), commit changes (commit this, commitear esto, make a commit, commit and push), push code (push, push to main, push to staging, subir cambios), open a pull request (create PR, open PR, abrir PR, crear pull request, gh pr create), fix merge conflicts (fix conflict, resolver conflicto, merge conflict, rebase conflict, push rejected), plan stacked or chained PRs (stack of PRs, chained PRs, split this PR, PR demasiado grande), set up an isolated git worktree (worktree, work in a worktree, isolate this work, parallel session, aislar el trabajo, trabajar aislado), set up or bootstrap a branching strategy on a fresh repo (set up our git strategy, bootstrap branching, configura el flujo de git, git strategy setup, materialize the git flow, create the staging branch and write the runbook), or pick / change / set up a branching strategy (git flow, git strategy, branching strategy, which git flow do we use, set up our git strategy, bootstrap branching, configura el flujo de git). Trigger even when the user does not say git-flow-master literally — if the work is git-or-PR-shaped, this is the right tool. Do NOT use for: testing tickets (use /sprint-testing), authoring test cases in TMS (use /test-documentation), writing automated tests (use /test-automation), running regression suites (use /regression-testing), or general code editing — git-flow-master operates strictly on the version-control layer.