git-workflow_skill

Overview

This skill provides expert Git workflow guidance and practical repository management advice for teams using Rust or other languages. It codifies branching models, commit conventions, pull request structure, and safety rules to keep repositories reliable and easy to maintain. Use it to align team practices, reduce merge friction, and improve CI/CD readiness.

How this skill works

The assistant inspects your current workflow goals and recommends an appropriate branching model (trunk-based, Git Flow, or GitHub Flow). It enforces branch naming and Conventional Commit patterns, offers step-by-step commands for common tasks (feature work, rebasing, reverting, recovering commits), and highlights safety rules to avoid destructive actions. It also provides PR templates, review guidance, and Git configuration tips to standardize developer behavior.

When to use it

• Onboard new team members to a consistent Git workflow
• Choose a branching model that fits your release cadence and team size
• Prepare repositories for continuous integration and deployment
• Resolve recurring merge conflicts and improve review quality
• Enforce commit and PR standards across projects

Best practices

• Keep commits small and focused; use Conventional Commits for clarity
• Protect main/develop with branch protection and require reviews
• Always pull/rebase before pushing and avoid force-pushing protected branches
• Use feature flags for incomplete work in trunk-based workflows
• Tag releases and avoid rewriting public history

Example use cases

• Small team adopting trunk-based development for daily deploys
• Product with scheduled releases using Git Flow for isolation
• Open source project enforcing PR reviews and Conventional Commits
• Resolving a complex merge conflict via rebase and force-with-lease
• Recovering a lost commit using git reflog and creating a recovery branch