skills.rest
freedom909
freedom909COMMUNITY
Explore all skills by this author →
GitHub

git-workflow

Guides Git branching strategies, commit conventions, and collaborative development workflows.

Updated Mar 18, 2026
Search Tags:#git#code review#version control#pull request#branching#merge conflict#commit conventions
One-click install
npx skills add https://github.com/freedom909/real-estate-saas --skill git-workflow-freedom909
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-workflow
Source: https://github.com/freedom909/real-estate-saas/tree/main/.trae/skills/git-workflow
Command: npx skills add https://github.com/freedom909/real-estate-saas --skill git-workflow-freedom909

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve? Teams struggle with inconsistent Git practices: unclear branching strategies, vague commit messages, messy merge histories, and painful conflict resolution. This Skill provides concrete patterns for choosing and applying the right Git workflow for any team size and release cadence. ## Core Features & Use Cases - Branching Strategy Selection: Compare GitHub Flow, Trunk-Based Development, and GitFlow with decision criteria based on team size and release cadence. - Commit & PR Conventions: Apply Conventional Commits formatting, PR title/description templates, and code review checklists. - Conflict Resolution & History Management: Resolve merge conflicts, decide between merge and rebase, manage releases with semantic versioning and tags. - Use Case: A startup team adopting continuous deployment can use this Skill to set up GitHub Flow with protected main branches, conventional commit messages, and a PR template that enforces testing checklists. ## Quick Start Ask the AI to recommend a Git branching strategy and commit message convention for your team's project setup.

Frequently Asked Questions about git-workflow

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

FAQPage Schema
How do I choose between GitFlow, GitHub Flow, and trunk-based development?▼

GitHub Flow suits continuous deployment and small-to-medium teams, trunk-based development fits experienced teams with feature flags deploying multiple times daily, and GitFlow works for scheduled releases in enterprise or regulated environments.

How do I write a good Git commit message?▼

Use the Conventional Commits format: type(scope): subject, such as feat(auth): add OAuth2 login. Types include feat, fix, docs, refactor, test, chore, perf, and ci, with an optional body explaining why the change was made.

When should I use git rebase instead of git merge?▼

Use rebase to update a local-only feature branch with the latest main for a linear history. Never rebase branches that have been pushed, shared, or already merged, since rebasing rewrites history and breaks others' work.

How do I resolve a Git merge conflict?▼

Run git status to see conflicted files, then edit the conflict markers manually, use git mergetool, or accept one side with git checkout --ours or --theirs. After resolving, stage the files with git add and commit.

How do I undo a commit that was already pushed?▼

Use git revert HEAD to create a new commit that undoes the changes, then push. Avoid git reset --hard or force-pushing on shared branches, since rewriting public history breaks collaborators' work.

Related Skills

Explore More Software Engineering Skills→
pradeepmoulipradeepmouli
2

speckit-git-initialize

Initialize a Git repository with configurable branch and .gitignore settings.

Community
Intermediate
tachfineamnaytachfineamnay

Git Workflow & CI/CD

Standardize Git workflows and CI/CD pipelines with Husky and GitHub Actions.

Community
Intermediate
daodaoedudaodaoedu

pre-commit-check

Run make check and make lint, then auto-fix with make format.

Official
Intermediate
PostHogPostHog
713

merging-prs

Enqueue pull requests into the Trunk merge queue and monitor them until merged.

Official
Advanced