title: How to merge my git changes?
body: <p>I am a GIT newbie so I have some basic questions about git commands, merging, etc.
  I just did some changes to code, I did a git commit, and then I tried to do the following command :</p>
  
  <pre><code>git push origin test:test 
  </code></pre>
  
  <p>(What does this syntax mean? I know I'm using branches called <code>test</code>)</p>
  
  <p>There was an error since some else made changes before I did my push.
  So the the error said I need to do get the code changes and merge.</p>
  
  <ol>
  <li><p>What command do I do to see what the differences are between my area and what's been changed by the other person? There is git diff but syntax should I use?</p></li>
  <li><p>I want to merge my changes in with his changes. How do I do that? </p></li>
  </ol>