title: Git merge master into remote tracked feature branch
body: <p>My team recently converted from Using Perforce to Git for source control.  One question I cannot find a good answer on is how to properly integrate changes changes from origin:master into my feature branch that is origin tracked (two developers are making commits into the branch).</p>
  
  <p>I tried to perform a Merge from master, but then I see a merge commit that shows all of the files I have modified in the current branch.  Is this expected?</p>
  
  <p>Note that my team is using SourceTree instead of command line.</p>