Merging a Pull Request4:20 with Jay McGavren
Once a pull request has passed review, it's time to merge it into your repo's primary branch.
GitHub has created a web app that's integrated with their platform called GitHub Learning Lab. It's a series of tutorials that will walk you through various operations on GitHub, including using branches to set up a GitHub Pages site for your project, and resolving merge conflicts in a pull request.
The excellent Pro Git book by Scott Chacon has a chapter dedicated to branches and merging. It's available to read online for free.
You need to sign up for Treehouse in order to download course files.Sign up