title: How do I stop Git subtree from automatically merging conflicts?
body: <p>So, I have a submodule that I'm trying to convert into a subtree. Disclaimer: I'm new to using subtrees.</p>
  
  <p>During my testing, I made a change in a file (changed 'foo' to 'bar') and pushed it via the subtree. Seemed to work.</p>
  
  <p>Then I went to the remote and undid that change (changed 'bar' to 'foo') with a new commit. So far so good.</p>
  
  <p>Then I went back to my local repo, pulled the subtree, and... nothing.</p>
  
  <p>My best guess is that it's merging the (older, foo->bar) change on the local to the (newer, bar->foo) change on the remote, and for some reason deciding that the older one should override the newer one, which leaves the code with 'bar'.</p>
  
  <p>Why is this happening, and can/should/how do I get it to stop?</p>
  
  <hr>
  
  <p><strong>EDIT:</strong> Adding the actual steps being done.</p>
  
  <p>1) Add SubTree from SourceTree:</p>
  
  <pre><code>git -c diff.mnemonicprefix=false -c core.quotepath=false --no-optional-locks subtree add -P MySubtree --squash {cloneUrl} master
  git fetch {cloneUrl} master
  From {cloneUrl}
  * branch              master     -&gt; FETCH_HEAD
  Added dir 'MySubtree'
  </code></pre>
  
  <p>2) Make change to code</p>
  
  <p>3) $ <code>git commit -am "SubtreeTest - add change"</code></p>
  
  <p>4) Push to SubTree using SourceTree:</p>
  
  <pre><code>git -c diff.mnemonicprefix=false -c core.quotepath=false --no-optional-locks subtree push -P MySubtree --squash {cloneUrl} master
  git push using:  {cloneUrl} master
  </code></pre>
  
  <p>5) Directly on BitBucket, make a new commit that undoes the last one.</p>
  
  <p>6) Pull from SubTree in SourceTree:</p>
  
  <pre><code>git -c diff.mnemonicprefix=false -c core.quotepath=false --no-optional-locks subtree pull -P MySubtree --squash {cloneUrl} master
  warning: no common commits
  From {cloneUrl}
  * branch              master     -&gt; FETCH_HEAD
  Auto-merging SubTree/BSC/Constants.cs
  Merge made by the 'recursive' strategy.
  Completed successfully.
  </code></pre>