jyjeanne/git-branching-strategy
skills/git-branching-strategy/SKILL.md
To standardize how developers collaborate on code, manage releases, and handle hotfixes to avoid conflicts and chaotic history. Use when: Setting up a new team workflow; Solving "merge hell" situations.
$ install --global
skillsauthnpx skillsauth add jyjeanne/ai-setup-forge git-branching-strategyInstall this skill globally with one command. Works with Claude Code, Cursor, and Windsurf.
Security Scan Results
3 of 9 scanners reported clean
Some scanners were skipped, did not run, or reported a non-clean status. Review each row below.
3
Scanners Passed
9
Scanners in report
Clean
TrivyContainer and dependency vulnerability scanner
95%
Clean
SemgrepStatic code analysis for vulnerabilities
95%
Clean
mcp-scan (Snyk)Model Context Protocol security validation
95%
Skipped
Snyk (dep)Open source security scanning
50%
Skipped
Socket.devSupply chain security analysis
50%
Skipped
VirusTotalMulti-engine malware detection
50%
Skipped
CrowdStrikeAdvanced threat intelligence
50%
Skipped
OSV-ScannerOpen Source Vulnerability database check
50%
Skipped
OWASP Dep-Check
50%
Last scanned: Apr 6, 2026, 11:34 AM12.7s1 file scanned
SKILL.md
- name:
- git-branching-strategy
- description:
- To standardize how developers collaborate on code, manage releases, and handle hotfixes to avoid conflicts and chaotic history. Use when: Setting up a new team workflow; Solving "merge hell" situations.
Purpose
To standardize how developers collaborate on code, manage releases, and handle hotfixes to avoid conflicts and chaotic history.
When to Use
- Setting up a new team workflow.
- Solving "merge hell" situations.
Procedure
1. Trunk-Based Development (Recommended for CI/CD)
The most efficient workflow for modern DevOps teams.
# 1. Create a short-lived feature branch from main
git checkout main
git pull origin main
git checkout -b feature/user-auth-api
# 2. Commit frequently with descriptive messages
git add .
git commit -m "feat: add jwt validation middleware"
# 3. Push and open a Pull Request (PR)
git push origin feature/user-auth-api
# 4. After PR approval and CI pass, merge to main (Squash merge preferred)
# (Done via GitHub/GitLab UI)
# 5. Delete local and remote branch
git branch -d feature/user-auth-api
git push origin --delete feature/user-auth-api
2. Standardized Naming Convention
Use prefixes to categorize branches and commits.
feat/: New feature development.fix/: Bug fix for the current environment.hotfix/: Critical fix for production.chore/: Maintenance tasks (updating dependencies, etc.).docs/: Documentation changes only.refactor/: Code change that neither fixes a bug nor adds a feature.
3. Release Management
Use Git Tags to mark production releases.
# Create a semantic version tag
git tag -a v1.2.0 -m "Release version 1.2.0: Includes User Auth and Billing fixes"
# Push tags to remote
git push origin v1.2.0
4. Handling Conflicts
Rebase or merge from main frequently to minimize conflict size.
# Bring latest changes from main into your branch
git checkout feature/my-feature
git fetch origin
git rebase origin/main
# If conflicts occur:
# 1. Manually fix files in editor
# 2. git add <fixed-files>
# 3. git rebase --continue
Constraints
- Branch Longevity: Feature branches should not live longer than 2-3 days. Long-lived branches lead to complex merge conflicts.
- Protected Branches: Enable branch protection on
mainordevelop. Require at least one approval and passing CI status before merging. - Commit History: Use "Squash and Merge" for PRs to keep the
mainhistory clean and linear. - No Direct Pushes: Never allow direct pushes to protected branches; everything must go through a PR.
Expected Output
A documented workflow policy that the team follows for all code changes.
Related Skills
jyjeanne/legacy-circuit-mockups
development
VerifiedTrustedCommunity
Generate breadboard circuit mockups and visual diagrams using HTML5 Canvas drawing techniques. Use when asked to create circuit layouts, visualize electronic component placements, draw breadboard diagrams, mockup 6502 builds, generate retro computer schematics, or design vintage electronics projects. Supports 555 timers, W65C02S microprocessors, 28C256 EEPROMs, W65C22 VIA chips, 7400-series logic gates, LEDs, resistors, capacitors, switches, buttons, crystals, and wires.
1SKILL.mdUpdated Apr 6, 2026
jyjeanne/lean-ux
development
VerifiedTrustedCommunity
Apply lean thinking to UX: hypothesis-driven design, collaborative sketching, and rapid experiments instead of heavy deliverables. Use when the user mentions "Lean UX", "design hypothesis", "UX experiment", "collaborative design", or "outcome over output". Covers hypothesis statements, MVPs for UX, and cross-functional collaboration. For Build-Measure-Learn, see lean-startup. For usability audits, see ux-heuristics.
1SKILL.mdUpdated Apr 6, 2026
jyjeanne/lean-startup
development
VerifiedTrustedCommunity
Design MVPs, validated learning experiments, and pivot-or-persevere decisions using Build-Measure-Learn. Use when the user mentions "MVP scope", "validated learning", "pivot or persevere", "vanity metrics", or "test assumptions". Covers innovation accounting and actionable metrics. For 5-day prototype testing, see design-sprint. For customer motivation analysis, see jobs-to-be-done.
1SKILL.mdUpdated Apr 6, 2026
jyjeanne/langsmith
tools
VerifiedTrustedCommunity
Instrument, trace, evaluate, and monitor LLM applications and AI agents with LangSmith. Use when setting up observability for LLM pipelines, running offline or online evaluations, managing prompts in the Prompt Hub, creating datasets for regression testing, or deploying agent servers. Triggers on: langsmith, langchain tracing, llm tracing, llm observability, llm evaluation, trace llm calls, @traceable, wrap_openai, langsmith evaluate, langsmith dataset, langsmith feedback, langsmith prompt hub, langsmith project, llm monitoring, llm debugging, llm quality, openevals, langsmith cli, langsmith experiment, annotate llm, llm judge.
1SKILL.mdUpdated Apr 6, 2026