title: Git pulls without normal merge conflicts
body: <p>I'm fairly new to Git, and have been working with it for only 3 months.  We previously migrated our repositories from SVN.</p>
  
  <p>I'd like to be able to merge changes from the master into my dev branch without getting "normal merge" conflicts that require "git mergetool", just so I can inspect a change that could have been merged without special notification.</p>
  
  <p>It may just be my previous SVN background, and an expectation that does not carry to Git, but I remember in SVN that I could merge a change from one branch to another, and it only required special attention if there was actually a merge conflict.  </p>
  
  <p>In Git, I'm finding I have to do "git mergetool" because any changes in the master always seem to result in a normal merge conflict, even though there are no actual merge conflicts.</p>
  
  <p>Currently, I pull changes from the master, and merge into the dev branch as follows:</p>
  
  <pre><code>$ git checkout master
  $ git pull
  $ git checkout dev
  $ git merge master
  ... [do normal merge conflict thing]
  $ git -a commit # though usually this is done via the gui, so I'm not sure of the exact command
  $ git push
  </code></pre>
  
  <p>Am I doing something wrong, or missing a config for merges that would be relatively straight forward in SVN, or are my expectations not appropriate for Git?</p>