Merging overview
If you are on a feature branch, and the feature is sufficiently complete and tested, you will want to merge your branch back into the main branch. Some organizations let you simply merge, others (most?) require that you create a Pull Request (PR). A PR says, essentially, "Please examine my code and if you think it is right, merge it into the main branch."
Having a second (or third) set of eyes on your code before merging can save a lot of headaches later on (see Chapter 12, Fixing Mistakes (Undo), on fixing mistakes).
Often, if you've been careful (see below) you will merge without a problem. From time to time, however, you will run into the dreaded merge conflict. You'll see below a couple ways to handle that conflict.
Book
You will remember from the previous chapter that we have a directory, C:\GitHub\VisualStudio\ProGitForProgrammers, that is the home of the Books application and that we've been editing in Visual Studio...
