title: git pull origin master marks changes from master as modified in my feature branch
body: <p>To update my feature branch with the latest changes from master, I used <code>git pull origin master</code>.</p>
  
  <p>I then received a message that says there are conflicts which I need to resolve first. I manually resolved those conflicts, but when I tried to run <code>git status</code>, I expect git to show only the files that I modified as a result of resolving the conflicts. The problem is that the changes from master that were not in my feature branch are marked as 'modified' as well.</p>
  
  <p>How do I pull changes from master such that git will only recognize the files that I really modified and not those that just came from master? I've been using git in a multi user environment just for a while now, and know that my previous git pulls doesn't recognize changes in master. Or maybe is it because of the conflict? If so how do I tell git to just merge those changes without marking them as modified?</p>