title: Working on Same file in GIthub
body: <p>Currently me and my friend working on one web application, we both have perform push and pull operation in GitHub.</p>
  
  <p>Now my question is, if I am working in file <code>test.php</code> and my friend also working in same file, once I finished my work, I create a new branch in GitHub and push into that branch and merge with <code>master</code>:  <code>master</code> now have the changes that I did.</p>
  
  <p>My friend didn't have that changes, now how we will merge those two files, without affecting my changed that I did past?  </p>
  
  <p>We push and pull via terminal only and we didn't maintain any local repository also.</p>