← Back to Curriculum

Git Workflows and Collaboration

📚 Lesson 7 of 12 ⏱️ 50 min

Git Workflows and Collaboration

50 min

Git Flow is a branching model that provides a robust framework for managing larger projects with multiple release cycles and parallel development. Git Flow defines specific branch types (main, develop, feature, release, hotfix) and rules for how they interact. This structure enables teams to coordinate work, manage releases, and handle urgent fixes systematically. Understanding Git Flow enables effective team collaboration. Git Flow is popular for projects with scheduled releases.

Feature branches should be created from develop and merged back into develop, keeping the main branch stable. Feature branches isolate new work, allowing developers to experiment without affecting the main codebase. Features are developed independently and integrated when complete. Understanding feature branches enables parallel development. Feature branches are the primary development branches in Git Flow.

Release branches are created from develop and merged into both main and develop, preparing code for production releases. Release branches allow final testing, bug fixes, and version bumping without blocking new feature development. When ready, release branches are merged to main (for deployment) and back to develop (to include release fixes). Understanding release branches enables organized release management. Release branches facilitate stable releases.

Hotfix branches are created from main and merged into both main and develop, enabling urgent production fixes without waiting for the next release cycle. Hotfixes address critical production issues that can't wait for normal release cycles. Hotfixes are merged to main (immediate deployment) and develop (to include in future releases). Understanding hotfix branches enables rapid production fixes. Hotfix branches are essential for production support.

Pull requests (or merge requests) provide a way to review code before merging, enabling code review, discussion, and quality control. Pull requests show proposed changes, allow comments and suggestions, and can trigger automated tests. They're essential for team collaboration and code quality. Understanding pull requests enables effective code review workflows. Pull requests are standard practice in modern development.

Alternative workflows include GitHub Flow (simpler, feature branches to main), GitLab Flow (with environment branches), and trunk-based development (small, frequent commits to main). Each workflow suits different team sizes and release cadences. Understanding different workflows enables you to choose appropriate approaches. Best practices include following team conventions, using pull requests for all merges, keeping branches short-lived, and communicating branch purposes clearly. Understanding Git workflows enables effective team collaboration.

Key Concepts

  • Git Flow provides a branching model for larger projects.
  • Feature branches are created from develop and merged back.
  • Release branches prepare code for production releases.
  • Hotfix branches enable urgent production fixes.
  • Pull requests enable code review before merging.

Learning Objectives

Master

  • Understanding Git Flow branching model
  • Creating and managing feature, release, and hotfix branches
  • Using pull requests for code review
  • Implementing effective collaboration workflows

Develop

  • Understanding team collaboration workflows
  • Designing effective branching strategies
  • Appreciating different Git workflow approaches

Tips

  • Use feature branches for all new work to keep main stable.
  • Create pull requests for all merges to enable code review.
  • Keep branches short-lived to reduce merge conflicts.
  • Follow your team's branching conventions.

Common Pitfalls

  • Not using feature branches, causing conflicts and instability.
  • Merging without pull requests, skipping code review.
  • Keeping branches open too long, causing difficult merges.
  • Not following team conventions, causing confusion.

Summary

  • Git Flow provides a structured branching model for teams.
  • Feature, release, and hotfix branches serve different purposes.
  • Pull requests enable code review and quality control.
  • Understanding Git workflows enables effective collaboration.
  • Choose workflows that fit your team's needs.

Exercise

Implement a Git Flow workflow for a feature development cycle.

# Start from develop branch
git checkout develop
git pull origin develop

# Create feature branch
git checkout -b feature/user-authentication

# Make changes and commit
git add .
git commit -m "Add user authentication system"

# Push feature branch
git push origin feature/user-authentication

# Create pull request on GitHub/GitLab
# After review and approval, merge to develop

# Clean up
git checkout develop
git pull origin develop
git branch -d feature/user-authentication

Code Editor

Output