git-workflowlisted

Git workflow conventions and conflict/recovery procedures — Conventional Commits format, branching models (Git Flow, GitHub Flow, trunk-based), pull request structure and review checklists, merge-versus-rebase choice, cherry-pick, interactive rebase, and guarded use of history-rewriting or destructive commands. Covers the rebase inversion where --ours is the upstream and --theirs is the user's own work. Use when resolving a merge or rebase conflict, choosing or documenting a branching strategy, writing a commit message or PR description to a convention, deciding between merging and rebasing, undoing or reverting a commit, cleaning up history before a PR, or recovering work after a bad reset, rebase, or force-push. Not needed for routine single commands whose syntax is already known — git status, git add, git diff, git log, staging, a plain commit, or a straightforward push or pull.
pfangueiro/claude-code-agents · ★ 6 · Code & Development · score 76

Install: claude install-skill pfangueiro/claude-code-agents

# Git Workflow ## Overview This skill provides comprehensive git workflow best practices, branching strategies, and collaboration patterns. Use it to ensure consistent, professional git usage across your projects. ## When to Use This Skill - Creating commits with proper messages - Establishing branching strategies (Git Flow, GitHub Flow, Trunk-Based) - Handling pull requests and code reviews - Managing releases and hotfixes - Resolving merge conflicts - Setting up git hooks and automation ## Core Workflows ### Commit Message Guidelines Follow the Conventional Commits specification for clear, semantic commit messages: **Format:** ``` <type>(<scope>): <subject> <body> <footer> ``` **Types:** - `feat`: New feature - `fix`: Bug fix - `docs`: Documentation changes - `style`: Formatting, missing semicolons, etc. - `refactor`: Code restructuring without behavior changes - `perf`: Performance improvements - `test`: Adding or updating tests - `chore`: Build process, dependencies, tooling - `ci`: CI/CD pipeline changes **Examples:** ``` feat(auth): add JWT token refresh mechanism Implement automatic token refresh before expiration. Tokens are refreshed 5 minutes before expiry. Closes #123 ``` ``` fix(api): handle null responses in user service Add defensive null checks to prevent NPE when external API returns unexpected null values. Fixes #456 ``` ### Branching Strategies #### Git Flow (Traditional) Best for: Scheduled releases, multiple version support **Branches:*