intermediate~4h
Git Branching and Merging
Branches are cheap pointers, not copies — learn how merge and rebase each rewrite history differently, when to reach for each, and how to resolve a real merge conflict confidently.
Learning objectives
- Intermediate: Explain why a Git branch is just a movable pointer to a commit, and why creating one is instant regardless of repository size.
- Intermediate: Contrast merge (preserves history, creates a merge commit) with rebase (rewrites history, linearizes it), and pick the right one for a given workflow.
- Advanced: Resolve a realistic merge conflict by reading conflict markers and reconstructing correct intent from both sides.
This is a Pro chapter
Sign in, then upgrade to Pro or Power to unlock this and the full DevOps Mastery library.
Git Branching and Merging