title: Git shows no merge conflicts when it should
body: <p>According to my understanding of merge conflicts, a merge conflict occurs when two people have changed the same file, and/or modified the same line in that file. So when I did a </p>
  
  <p><code>git pull origin master</code></p>
  
  <p>I expected a merge conflict, since the same line was different in both the versions, but it looks like git decided to overwrite my local files.</p>
  
  <p>To give more information, 
  I pushed my version on Github few days back. Then someone pulled it, worked with it, and pushed it back to github. Two of the files the other guy modified are of interest to me.</p>
  
  <p>The first file is a config file, and the other guy changed the password in that. So when I pulled from github, the password in my local version was different from that on github. BUT, in my terminal, it said </p>
  
  <pre><code>Auto-merging &lt;filename&gt;
  </code></pre>
  
  <p>And, it overwrites my file and the password was the one set by the different guy.</p>
  
  <p>The second file of interest is an HTML file written in a template engine(PUG). The other guy changed a lot of things in that file, like added a lot of css classes, removed some classes I had used, added links to css files and all. BUT when I pulled it, the terminal did not even mention that it was auto merging it, and just overwrote the entire file in my local repo and used the one from Github.</p>
  
  <p>For both of the files, my question is, whether this is the expected behaviour from using git pull, or did I do anything wrong? </p>
  
  <p>Below are the commands I used.</p>
  
  <pre><code>git checkout -b "misc"
  git pull origin master
  </code></pre>
  
  <p>Also, I tried to just use fetch and then manually merge/commit it, but when I used fetch, nothing happened. The files did not change at all.</p>
  
  <p>I have used git/github before, but never really worked extensively in a team using branches and pushing/pulling from github.</p>