title: Using Git/Github properly when working on a team
body: <p>Example:</p>
  
  <ul>
  <li><p>I cloned the Github repository, created a new branch and started working on a feature. </p></li>
  <li><p>My co-worker clones the same exact Github repository, creates his own branch on his local machine (git checkout -b mylocalbranch), and works on his own feature.</p></li>
  <li><p>My co-worker finishes his feature before I do and pushes it to production and back to Github.</p></li>
  <li><p>I finish my feature 30 minutes later and want to push my work without causing any conflicts. </p></li>
  </ul>
  
  <p>What is the best way to push my work to production and back to Github without causing any conflicts? </p>