title: Why do I always have to merge manually on git pull?
body: <p>I am a new user of git and can't figure out how to get around this. I have had some experience with SVN and am going by SVN behavior.</p>
  
  <p>Any time I pull files from remote repository, and the file I have modified are also modified remotely, it needs merging. I can understand merge conflicts for complex changes, but I am seeing merge conflicts for very small (e.g. one line change in different functions) changes. As far as I remember, SVN could merge most of it automatically and will put the file in conflicted state only if automatic merge failed.</p>
  
  <p>For git, it seems to be happening every time and forcing to open the git merge tool. Is there any way to automatically merge the files? Am I missing some setting that is basically putting the repository in conflicted set by default?</p>