title: Pulling master from Github from a side branch
body: <p>I'm working on a separate branch from the master branch, and I wondering what will happen if I pull the latest changes from Github. Should I pull from the master branch or the side branch? If I pull from the side branch, will it just merge the updates with my new code in the side branch?</p>