# Git Workflow > Defines git workflow patterns including branching strategy, commit conventions, and PR practices. Use when this capability is needed. - Skill: `tomevault-io/git-workflow-80` (Agent Skill, multi-file: 2 files) - Install (CLI): `npx skillmds@latest add tomevault-io/git-workflow-80` - Raw SKILL.md: https://api.skillmd.com/api/skills/tomevault-io/git-workflow-80/raw - Safety review: pending (external: skill-scanner PASS, skillspector WARNING) - Works with: Claude Code, Claude.ai, OpenAI Codex - Category: Productivity - Author: tomevault-io (https://skillmd.com/u/tomevault-io) - Updated: 2026-09-17 - Page: https://skillmd.com/skills/tomevault-io/git-workflow-80 --- # Git Workflow and Branching Strategy ## Overview NXTG-Forge follows a **trunk-based development** approach with short-lived feature branches. This workflow emphasizes continuous integration, small frequent commits, and maintaining a deployable main branch. ## Branch Strategy ### Main Branch (`main`) - **Always deployable**: Every commit on main should be production-ready - **Protected**: Requires pull requests and passing CI checks - **Source of truth**: All feature branches originate from main ### Feature Branches - **Short-lived**: Typically 1-3 days - **Single purpose**: One feature or fix per branch - **Naming convention**: `feat/description`, `fix/description`, `refactor/description` ```bash # Feature branch examples feat/user-authentication feat/payment-integration fix/login-validation-bug refactor/clean-architecture-migration docs/api-documentation ``` ### No Long-Lived Branches We **do not** use: - `develop` branch - `release` branches - `hotfix` branches (fix directly from main) --- ## Workflow Steps ### 1. Start New Work ```bash # 1. Ensure main is up to date git checkout main git pull origin main # 2. Create feature branch git checkout -b feat/user-authentication # 3. Verify branch git branch --show-current # Output: feat/user-authentication ``` ### 2. Make Changes ```bash # 1. Work on feature # Edit files... # 2. Check status frequently git status # 3. Stage changes git add forge/auth/ git add tests/unit/test_auth.py # 4. Commit with descriptive message git commit -m "Add JWT authentication middleware - Implement JWT token validation - Add token expiration checking - Create authentication decorator - Add unit tests for middleware 🤖 Generated with Claude Code Co-Authored-By: Claude " ``` ### 3. Keep Branch Updated ```bash # Rebase frequently to stay current git fetch origin git rebase origin/main # If conflicts occur # 1. Resolve conflicts in files # 2. Stage resolved files git add # 3. Continue rebase git rebase --continue ``` ### 4. Push Changes ```bash # First push (set upstream) git push -u origin feat/user-authentication # Subsequent pushes git push # Force push after rebase (use with caution) git push --force-with-lease ``` ### 5. Create Pull Request ```bash # Using GitHub CLI gh pr create \ --title "Add user authentication" \ --body "$(cat <<'EOF' ## Summary - Implements JWT-based authentication - Adds authentication middleware - Includes comprehensive tests ## Test Plan - [x] Unit tests for JWT validation - [x] Integration tests for auth flow - [x] Manual testing with Postman 🤖 Generated with Claude Code EOF )" # OR create via GitHub web interface ``` ### 6. Code Review and Merge ```bash # After approval, merge via GitHub UI # OR use CLI gh pr merge --squash # Delete feature branch git branch -d feat/user-authentication git push origin --delete feat/user-authentication ``` --- ## Commit Message Guidelines ### Format ``` :