Integrating source code changes from one Git branch to another can happen either through a merge or a rebase. Merging preserves the branch history, while rebasing doesn't.

In this Coffee Break Course, instructor Ed Wassermann will explain the difference between merge and rebase. You'll learn when to use one or the other and how they can both be used to roll changes from feature branches back to master.

Why not check out our Introduction to Git and GitHub or watch the other Coffee Break Courses in this series:

• Git Basics: The Three Trees
• Git Basics: Reset
• Git Basics: GitHub Pull Requests
• Git Basics: Branches
• Git Basics: States
• Git Basics: Distributed Workflows
• Git Basics: Git Rebase Mixtape