title: Why does XCode constantly do "Merge remote-tracking branch 'origin/master'"
body: <p>I am new to XCode. Recently started working with a team on an iPhone project. We're using GitHub for our source control, and pulling/comitting/pushing straight from XCode (5.1).</p>
  
  <p>We're all working on master at the moment.</p>
  
  <p>I have noticed that our commit log has a ton of the following statements:</p>
  
  <pre><code>Merge remote-tracking branch 'origin/master'
  </code></pre>
  
  <p>These seem pretty superfluous. These items are almost always identical to a previous commit from another user.</p>
  
  <p>Example Scenario:</p>
  
  <ol>
  <li>User A and user B do a PULL to start working on code.</li>
  <li>User A edits <em>SomeViewController.m</em> and does s COMMIT and a PUSH.</li>
  <li>User B edits <em>AnotherViewController.m</em> and does a COMMIT and a PUSH.</li>
  <li>User B is greeted with an error [from XCode] that he must PULL before he can COMMIT.</li>
  <li>User B does a PULL, then a COMMIT.</li>
  </ol>
  
  <p>Now there are 3 items in the commit log:</p>
  
  <ol>
  <li>The change from User A</li>
  <li>The change from User B</li>
  <li>Merge remote-tracking branch 'origin/master'</li>
  </ol>
  
  <p>But #1 and #3 are identical! What are we doing wrong? Or is this just a neccessary evil of using Git and XCode together?</p>