# Git Branching and Collaboration

> Master parallel development with Git branches, learn effective merging strategies, and navigate the Pull Request lifecycle for seamless team collaboration.

Canonical: https://codelivly.com/rooms/git-branching-and-collaboration
Last updated: 2026-10-26

| | |
|---|---|
| Level | Beginner |
| Category | Cybersecurity |
| Lessons | 5 |
| Estimated time | 30 min |
| XP | 100 |

This module transitions you from solo Git usage to professional, team-based collaboration. You will learn how to create, manage, and delete branches to isolate features and bug fixes safely. We will demystify merging strategies (Fast-Forward vs. Merge Commits), teach you how to gracefully resolve merge conflicts, and walk you through the industry-standard Pull Request (PR) lifecycle. By the end of this module, you will be able to collaborate on shared codebases without fear of overwriting your teammates' work or breaking the main branch.

## Lessons

1. What Is Branching and Why Does It Matter (30 min)
2. Branching Strategies (Trunk-Based vs GitFlow) (30 min)
3. The Pull Request (PR) Lifecycle and Code Review Workflow (30 min)
4. Resolving Merge Conflicts Like a Pro (30 min)
5. Guided Lab: Running a Pull Request Workflow with Branch Protection (30 min)

## Related

- [Learning path: Software Development and Git Fundamentals](https://codelivly.com/learning-paths/software-development-and-git-fundamentals)
- [All rooms](https://codelivly.com/rooms)