title: GITHUB Conflict Resolving
body: <p>I am a newbie for github and started using <strong>GITHUB for WINDOWS</strong> chosen private repositories and shared the same with my colleagues. </p>
  
  <p>Now we are experiencing a problem, not sure how to solve it. We tried google and no use.</p>
  
  <p><strong>Myself and a colleague worked on a same file at a same time, he committed before me</strong>. I like to know the changes he made and I want to merge his change with my local file and finally want to commit my version. Is it possible with GITHUB using GITHUB for windows? I have done the same before with Tortoise SVN</p>
  
  <p>I Opened shell command prompt and tried something like</p>
  
  <pre><code>  $ git diff
  </code></pre>
  
  <p>But it shows only differences and not advised me to merge local with staged version ..</p>