This is a continuation of a tutorial blog series to learn the basics of Git, using GitHub and the GitHub client.

To start from the beginning, go here: http://www.tobiahmarks.com/2014/08/intro-git-github-0/

In this part, you will learn:
Merging branches
Resolving conflicts
Undoing a merge
Rebasing
When should you merge and when should you rebase?

You can read more by going to the "Intro to Git and GitHub Part 4: Merging and Rebasing overview" post on Tobiah Marks blog.