In this Coffee Break Course, Envato Tuts+ instructor Ed Wasserman will explain some of the fundamentals of Git. Follow along as Ed explains core Git concepts, all illustrated with helpful animations.

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.

See this course on Envato Tuts+: https://code.tutsplus.com/courses/git-basics-merge-and-rebase?utm_campaign=yt_tutsplus_dO9BtPDIHJ8&utm_medium=referral&utm_source=youtube.com&utm_content=description

Watch the rest of the series:

- Git Basics: The Three Trees (https://code.tutsplus.com/courses/git-basics-the-three-trees?utm_campaign=yt_tutsplus_dO9BtPDIHJ8&utm_medium=referral&utm_source=youtube.com&utm_content=description)
- Git Basics: GitHub Pull Requests (https://code.tutsplus.com/courses/git-basics-github-pull-requests?utm_campaign=yt_tutsplus_dO9BtPDIHJ8&utm_medium=referral&utm_source=youtube.com&utm_content=description)
- Git Basics: Branches (https://code.tutsplus.com/courses/git-basics-branches?utm_campaign=yt_tutsplus_dO9BtPDIHJ8&utm_medium=referral&utm_source=youtube.com&utm_content=description)
- Git Basics: States (https://code.tutsplus.com/courses/git-basics-states?utm_campaign=yt_tutsplus_dO9BtPDIHJ8&utm_medium=referral&utm_source=youtube.com&utm_content=description)
- Git Basics: Merge and Rebase (https://code.tutsplus.com/courses/git-basics-merge-and-rebase?utm_campaign=yt_tutsplus_dO9BtPDIHJ8&utm_medium=referral&utm_source=youtube.com&utm_content=description)
- Git Basics: Distributed Workflows (https://code.tutsplus.com/courses/git-basics-distributed-workflows?utm_campaign=yt_tutsplus_dO9BtPDIHJ8&utm_medium=referral&utm_source=youtube.com&utm_content=description)