title: git with XCode and ignoring .xcodeproj on merge?
body: <p>I'm getting up to speed on using git with XCode but have run into a situation that I'm not quite sure how to handle.</p>
  
  <p>I have a branch of my project "<code>branchA</code>" that has a build target base SDK of iOS 3.2</p>
  
  <p>I have "<code>branchB</code>" that has been forked from branchA that has a build target base SDK for iOS4.2</p>
  
  <p>I'm continuing with development on both branches, <code>branchA</code> with functionality that doesn't depend on SDK4.2 features, <code>branchB</code> for those features that do depend on 4.2</p>
  
  <p>From time to time, I want to merge the changes made in <code>branchA</code> into <code>branchB</code>.<br>
  This of course results in some conflicts that I can easily correct -- except those that occur in the <code>.xcodeproj</code> file</p>
  
  <p>How can I tell git not to merge the <code>.xcodeproj</code> file from <code>branchA</code> into <code>branchB</code> -- in essence, keep the <code>.xcodproj</code> file in branchB and ignore any differences it may have with <code>branchA</code>?</p>