Overview
This module covers how teams collaborate with Git: pull requests, code reviews, branch strategies, and common workflows.
Learning Objectives
- Understand pull requests and code review
- Learn common branching workflows
- Use feature branches effectively
- Keep your branch up to date
- Handle review feedback cleanly
- Use merge, squash, and rebase in collaboration
- Avoid common teamwork pitfalls
Topics Covered
5.1 What is a Pull Request?
- Purpose of PRs
- Review and discussion
5.2 Code Review Basics
- What reviewers look for
- How to give good feedback
5.3 Feature Branch Workflow
- Create, work, open PR
5.4 Keeping Branches Up to Date
- Pull/rebase from main
5.5 Merge vs Squash vs Rebase (Team Use)
- When teams choose each
5.6 Handling Review Feedback
- Make changes, push updates
5.7 Resolving Review Conflicts
- Update branch, resolve, re-push
5.8 Trunk-Based Development (Conceptual)
- Short-lived branches
5.9 GitHub Flow vs GitFlow (Conceptual)
- High-level comparison
5.10 Collaboration Best Practices
- Small PRs
- Clear commit messages
Hands-on Exercises
- Create a feature branch and open a PR.
- Simulate code review comments and update the branch.
- Rebase a branch on top of main.
- Resolve a review conflict.
- Compare GitHub Flow and GitFlow.
Key Takeaways
- PRs are the main review gate for teamwork.
- Branch workflows keep teams aligned.
- Small, clean changes speed up reviews.
Additional Resources
- Pro Git: Distributed Workflows
- GitHub and GitLab docs on PRs/MRs
Assessment
- Quiz on workflows and collaboration terms
- Practical: open a PR and address feedback
Next Module
Module 06 will cover tags, releases, and versioning.