Summary

You should now have a good overall feel for how to run a merge, although it will probably take a little practice to feel completely comfortable with the process. If you veer off the beaten path and get perplexed, come back to the procedure described here to solidify your understanding of the basic steps.