title: Strange git behaviour reverting changes made in local branches after pulling upstream merges
body: <p>We have a team of around 10 developers and we are frequently running into a situation where someone's changes got reverted unexpectedly. Our workflow has been very simple. Developers make local commits, pull from upstream, and then push to upstream (this is our workflow in a nutshell, but it may also include issuing pull requests on Github from a developer's personal fork of upstream). The strange behavior is a developer makes local commits, pulls from upstream, and then finds his changes have reverted back. It's as if git is resolving conflicts with <code>theirs</code> strategy although none of us have this setting, nor are there actual merge conflicts involved. The changes are more like this:</p>
  
  <p>Local commit:</p>
  
  <pre><code>.some_style {
  -  width: 150px;
  +  width: 100px;
    color: black;
  }
  </code></pre>
  
  <p>After merge:</p>
  
  <pre><code>.some_style {
    width: 150px;
    color: black;
  }
  </code></pre>
  
  <p>There are no other commits touching this section of code, and no one is manually resolving merge conflicts (which shouldn't exist anyway). After the developer completes the merge and pushes it upstream, we sometimes see a diff log on another developer's commit that appears to reverse the changes made by the first developer. Usually this revert commit appears under someone else's name, although they have not touched the file in question.</p>
  
  <p>Some other developer's commit:</p>
  
  <pre><code>.some_style {
  +  width: 150px;
  -  width: 100px;
    color: black;
  }
  </code></pre>
  
  <p>We have no idea how this is happening or how to recreate it. Perhaps our knowledge of git collaboration is lacking in some respect and hopefully someone can point us in the right direction.</p>
  
  <p><strong>EDIT</strong>
  This problem seems to only affect css/scss files. I noticed that the diff headers are showing the wrong information:</p>
  
  <pre><code>@@ -359,10 +367,12 @@ img.badge-pic {
  
   #sampleProfileCover {
     float: left;
  -  width: 200px;
  +  width: 230px;
  +  height: 150px;
     text-align: center;
     img {
       width: 200px;
  +    height: 220px;
     }
   }
  </code></pre>
  
  <p>Notice that the header identifies this style as <code>img.badge-pic</code>. That style actually appears much earlier in the file. Could git be having trouble parsing css/sass?</p>