| layout | title | nav_order | has_children | parent |
|---|---|---|---|---|
default |
Claude Code Tutorial - Chapter 6: Git Workflows |
6 |
false |
Claude Code Tutorial |
Welcome to Chapter 6: Git Workflows - Commits, Branches, and Version Control. In this part of Claude Code Tutorial: Agentic Coding from Your Terminal, you will build an intuitive mental model first, then move into concrete implementation details and practical production tradeoffs.
Master Git integration with intelligent commits, branching strategies, and collaborative development workflows.
Claude Code has deep Git integration that automatically creates commits, manages branches, and supports collaborative development. This chapter covers Git workflows, commit strategies, and version control best practices.
# Claude automatically creates commits for approved changes
# Example workflow:
> Add user authentication to the API
# Claude makes changes to:
# - routes/auth.py (new)
# - models/user.py (modified)
# - middleware/auth.py (new)
# Generated commit:
# feat: Add user authentication API with login/logout endpoints
#
# - Create authentication routes
# - Add user model with password hashing
# - Implement JWT token middleware
# - Add input validation and error handling
# Commit details:
# 3 files changed, 150 insertions(+), 5 deletions(-)# Claude generates conventional commit messages:
# Types used:
# feat: New features
# fix: Bug fixes
# docs: Documentation
# style: Code style changes
# refactor: Code refactoring
# test: Testing
# chore: Maintenance
# Examples:
# feat: Implement user registration with email verification
# fix: Resolve null pointer exception in payment processing
# docs: Add API documentation for user management endpoints
# refactor: Extract validation logic into separate module
# test: Add unit tests for authentication service
# chore: Update dependencies to latest versions# Claude analyzes what changed to create accurate commit messages:
# Code additions: "feat: Add user profile management"
# Bug fixes: "fix: Correct email validation regex"
# Refactoring: "refactor: Simplify authentication logic"
# Documentation: "docs: Update API documentation"
# Tests: "test: Add integration tests for user API"
# Configuration: "chore: Update Docker configuration"
# Detailed breakdown in commit body:
# - List of files changed
# - Summary of changes made
# - Any breaking changes noted# Create feature branches for new work
> Create a new branch for implementing user notifications
# Claude will:
# 1. Check current branch status
# 2. Create new branch with descriptive name
# 3. Switch to the new branch
# 4. Confirm successful branch creation
# Example:
# Created branch 'feature/user-notifications'
# Switched to branch 'feature/user-notifications'
# Ready to implement user notifications feature.# Claude follows standard branch naming:
# Feature branches:
# feature/user-authentication
# feature/payment-integration
# feature/admin-dashboard
# Bug fix branches:
# fix/login-validation-bug
# fix/payment-processing-error
# hotfix/security-vulnerability
# Release branches:
# release/v1.2.0
# release/v2.0.0
# Maintenance branches:
# chore/dependency-updates
# refactor/code-cleanup# Switch between branches
> Switch to the main branch
> Switch to the feature/user-profile branch
# Merge branches
> Merge the feature branch into main
# Delete branches
> Delete the completed feature branch
# List branches
> Show all branches and current status# Check repository state
> What is the current git status?
# Claude shows:
# - Current branch
# - Uncommitted changes
# - Untracked files
# - Ahead/behind remote status
# Example output:
# On branch main
# Your branch is up to date with 'origin/main'
#
# Changes not staged for commit:
# modified: src/auth.py
# new file: tests/test_auth.py
#
# Untracked files:
# docs/api.md# Review recent commits
> Show the last 5 commits
# Claude displays:
# commit abc123 (HEAD -> main)
# Author: Claude Code <claude@anthropic.com>
# Date: Mon Jan 15 14:30:00 2024
#
# feat: Add user authentication system
#
# - Implement login/logout endpoints
# - Add password hashing with bcrypt
# - Create user session management
#
# commit def456
# Author: Claude Code <claude@anthropic.com>
# Date: Mon Jan 15 10:15:00 2024
#
# refactor: Extract database models to separate module
# Analyze commit patterns
> What types of changes have been made recently?
> Who has been the most active contributor?
> Are there any large commits that should be broken down?# Review changes before committing
> Show me what changed in the last commit
# Claude shows git diff with analysis:
# The last commit added user authentication features:
# - New authentication routes in routes/auth.py
# - User model updates in models/user.py
# - Password validation utilities
# - 145 lines added, 12 lines modified
# Compare branches
> Show differences between main and feature branch
> What changed in the last week?# Prepare for code review
> Prepare the current branch for a pull request
# Claude will:
# 1. Ensure all changes are committed
# 2. Run tests to verify functionality
# 3. Check code quality (linting)
# 4. Generate PR description
# 5. Suggest reviewers
# Example PR preparation:
# ✅ All changes committed
# ✅ Tests passing (15/15)
# ✅ Code quality checks passed
# ✅ Branch is up to date with main
#
# Pull Request Title: Add User Authentication System
# Description: Implements complete user authentication with JWT tokens, password hashing, and session management.
#
# Suggested reviewers: @security-team, @backend-team# Assist with code reviews
> Review the changes in the feature branch
# Claude analyzes:
# - Code quality and style
# - Security vulnerabilities
# - Performance implications
# - Test coverage
# - Documentation updates
# Example review:
# ✅ Good separation of concerns
# ✅ Comprehensive error handling
# ✅ Well-documented functions
# ⚠️ Consider adding input validation for edge cases
# ⚠️ Missing tests for error conditions
# ✅ Follows project conventions# Handle merge conflicts
> There are merge conflicts, help me resolve them
# Claude will:
# 1. Identify conflicted files
# 2. Show conflict details
# 3. Suggest resolution strategies
# 4. Apply resolutions
# Example conflict resolution:
# Conflicts in src/auth.py:
# - Both branches modified the login function
# - Main branch: Added rate limiting
# - Feature branch: Added 2FA support
#
# Resolution: Combine both changes - rate limiting + 2FA
# Would you like me to apply this resolution?# Support for Git Flow branching model
> Start a new feature in Git Flow
# Claude creates:
# - feature/user-dashboard branch from develop
# - Implements feature
# - Creates PR to develop branch
# Release preparation
> Prepare for release v1.2.0
# Claude:
# - Creates release branch
# - Updates version numbers
# - Updates changelog
# - Tags release# Short-lived branches with frequent merges
> Create a short feature branch for the bug fix
# Claude:
# - Creates branch from main
# - Implements quick fix
# - Runs tests
# - Merges back to main immediately
# Benefits: Reduces merge conflicts, faster feedback# Commit staging and management
> Stage all changes and commit with generated message
# Claude:
# 1. git add .
# 2. Analyzes changes
# 3. Generates commit message
# 4. Commits changes
# Push operations
> Push the current branch to remote
# Pull operations
> Pull latest changes from main branch# Create focused, atomic commits
> Implement user login functionality
# Claude creates separate commits for:
# - Database schema changes
# - API endpoint implementation
# - Frontend integration
# - Tests
# Benefits:
# - Easier code review
# - Simpler rollbacks
# - Better git history# Detailed commit messages with context
> Implement payment processing with stripe integration
# Generated commit:
# feat: Add Stripe payment processing integration
#
# - Implement payment intent creation
# - Add webhook handling for payment confirmation
# - Create payment status tracking
# - Add error handling for failed payments
# - Include comprehensive tests
#
# Closes #123
# Related: #124, #125# Link commits to issues and PRs
> This implements the user authentication feature from issue #456
# Claude includes in commit message:
# feat: Implement user authentication system
#
# Implements feature request #456
# - JWT token-based authentication
# - Password hashing with bcrypt
# - Session management
# - Login/logout endpoints# Complete feature development workflow
1. > Create feature branch for user profile management
2. > Implement user profile API endpoints
3. > Add comprehensive tests
4. > Run code quality checks
5. > Prepare pull request
6. > Merge to main after review
# Claude handles each step automatically# Emergency fixes
1. > Create hotfix branch from main for critical security fix
2. > Implement minimal fix for security vulnerability
3. > Add regression test
4. > Merge directly to main and all release branches
5. > Tag emergency release
# Claude ensures proper hotfix procedures# Release preparation
> Create release branch for v2.0.0
# Claude:
# - Creates release/v2.0.0 branch
# - Updates version in package files
# - Updates changelog
# - Freezes new features
# - Allows only bug fixes
# Release completion
> Finalize release v2.0.0
# Claude:
# - Merges release branch to main
# - Tags release
# - Merges back to develop
# - Deletes release branch# Set up quality checks before commits
> Configure pre-commit hooks for code quality
# Claude creates .pre-commit-config.yaml:
# repos:
# - repo: https://github.com/pre-commit/pre-commit-hooks
# rev: v4.4.0
# hooks:
# - id: trailing-whitespace
# - id: end-of-file-fixer
# - id: check-yaml
# - id: check-added-large-files
#
# - repo: https://github.com/psf/black
# rev: 23.7.0
# hooks:
# - id: black
#
# - repo: https://github.com/pycqa/flake8
# rev: 6.0.0
# hooks:
# - id: flake8
# Install hooks
> /run pre-commit install# Ensure conventional commit messages
> Set up commit message linting
# Claude configures commitizen or similar:
# - Validates commit message format
# - Ensures proper conventional commit structure
# - Provides feedback on message quality
# Example enforcement:
# ❌ "fixed bug" → "fix: Resolve null pointer exception in user service"
# ✅ "feat: Add user profile picture upload functionality"# Clean up repository
> Perform git repository maintenance
# Claude runs:
# - git gc (garbage collection)
# - git prune (remove unreachable objects)
# - git fsck (filesystem check)
# - Clean up merged branches
# Large file handling
> Set up Git LFS for large files
# Claude configures:
# - Install Git LFS
# - Track large file patterns
# - Migrate existing large files# Analyze repository health
> Analyze the git repository health
# Claude reports:
# - Repository size and growth
# - Largest files and contributors
# - Branch status and merge status
# - Potential issues (large files, old branches)
# - Recommendations for optimization
# Repository statistics
> Show repository statistics
# Reports:
# - 450 commits, 15 contributors
# - Main languages: Python (60%), TypeScript (30%)
# - Largest files: model_weights.pkl (500MB)
# - Active branches: 8 feature branches, 2 release branches# Keep branches up to date
> Sync the feature branch with main
# Claude:
# 1. Switches to main
# 2. Pulls latest changes
# 3. Switches back to feature branch
# 4. Merges main into feature branch
# 5. Resolves any conflicts
# Regular sync prevents large conflicts later# Coordinate with team
> Check if anyone else is working on authentication
# Claude can:
# 1. Check recent commits by others
# 2. Look for related branches
# 3. Suggest communication with team members
# 4. Propose coordination strategies
# Example: "John is working on auth in branch feature/oauth-integration.
# Consider coordinating to avoid conflicts."# Create reusable git workflows
> Create a script for the standard feature development workflow
# Claude generates:
# feature-workflow.sh
# - Create feature branch
# - Implement feature
# - Run tests
# - Create PR
# - Clean up
# Usage: ./feature-workflow.sh "user-dashboard"# Integrate with CI/CD pipelines
> Set up GitHub Actions for automated testing
# Claude creates:
# .github/workflows/ci.yml
# - Run tests on push/PR
# - Build application
# - Deploy to staging
# - Run integration tests
# GitOps workflows
> Set up GitOps deployment workflow
# Creates:
# - ArgoCD manifests
# - Kustomize overlays
# - GitHub Actions for deploymentIn this chapter, we've covered:
- Automatic Commits: Intelligent commit message generation and content analysis
- Branch Management: Feature branches, naming conventions, and operations
- Git Status: Repository state checking and history analysis
- Collaborative Development: PR preparation, code reviews, and conflict resolution
- Advanced Workflows: Git Flow, trunk-based development, and automation
- Commit Strategy: Atomic commits, detailed messages, and issue linking
- Branch Strategies: Feature branches, hotfixes, and release branches
- Git Hooks: Pre-commit hooks and commit message linting
- Repository Maintenance: Cleanup, analysis, and large file handling
- Conflict Prevention: Branch sync and team coordination
- Workflow Automation: Custom scripts and CI/CD integration
- Intelligent Commits: Claude generates meaningful, conventional commit messages
- Branch Safety: Proper branching strategies prevent conflicts and enable collaboration
- Quality Commits: Atomic, well-documented commits with proper linking
- Review Ready: Automated PR preparation and code review assistance
- Conflict Resolution: Intelligent merge conflict handling and prevention
- Workflow Integration: Seamless integration with existing Git workflows
- Maintenance Automation: Automated repository cleanup and health monitoring
- Team Coordination: Awareness of team activities and collaboration support
Now that you understand Git workflows, let's explore MCP integration and extending Claude Code with custom tools.
Ready for Chapter 7? MCP Integration
Generated for Awesome Code Docs
Most teams struggle here because the hard part is not writing more code, but deciding clear boundaries for branch, Claude, feature so behavior stays predictable as complexity grows.
In practical terms, this chapter helps you avoid three common failures:
- coupling core logic too tightly to one implementation path
- missing the handoff boundaries between setup, execution, and validation
- shipping changes without clear rollback or observability strategy
After working through this chapter, you should be able to reason about Chapter 6: Git Workflows - Commits, Branches, and Version Control as an operating subsystem inside Claude Code Tutorial: Agentic Coding from Your Terminal, with explicit contracts for inputs, state transitions, and outputs.
Use the implementation notes around user, commit, branches as your checklist when adapting these patterns to your own repository.
Under the hood, Chapter 6: Git Workflows - Commits, Branches, and Version Control usually follows a repeatable control path:
- Context bootstrap: initialize runtime config and prerequisites for
branch. - Input normalization: shape incoming data so
Claudereceives stable contracts. - Core execution: run the main logic branch and propagate intermediate state through
feature. - Policy and safety checks: enforce limits, auth scopes, and failure boundaries.
- Output composition: return canonical result payloads for downstream consumers.
- Operational telemetry: emit logs/metrics needed for debugging and performance tuning.
When debugging, walk this sequence in order and confirm each stage has explicit success/failure conditions.
Use the following upstream sources to verify implementation details while reading this chapter:
- Claude Code Repository
Why it matters: authoritative reference on
Claude Code Repository(github.com). - Claude Code Releases
Why it matters: authoritative reference on
Claude Code Releases(github.com). - Claude Code Docs
Why it matters: authoritative reference on
Claude Code Docs(docs.anthropic.com).
Suggested trace strategy:
- search upstream code for
branchandClaudeto map concrete implementation paths - compare docs claims against actual runtime/config code before reusing patterns in production