In this tutorial, we'll merge a feature branch into your master branch. You might want to do this after working on a new feature or bug in your secondary branch. When the time comes to merge back into the rest of your project, follow these steps.
