title: Github merge to behind branch
body: <p>So I just had a quick question surrounding Github and pulling and branches and stuff. So I was wondering what the procedure would be when 2 people are working on a a project in this situation.</p>
  <p>So say there are 3 branches: master, firstBranch and secondBranch. firstBranch and secondBranch are both being worked on. When firstBranch merges with master to push their code into the master branch, what should the person working on secondBranch do so when they merge there aren't conflicts? If they pull the main branch that is fine, but the code they are working on in the secondBranch will be outdated still?</p>
  <p>Thanks</p>