title: How to get changes from master branch to local branch?
body: <p>I have, what I assume, is a typical workflow.</p>
  
  <p>Our project works with pull requests.</p>
  
  <p>To develop new feature I create a dev. branch.
  By the time I am finished with the feature some changes were made in master
  so I want to get those changes into my branch so I make pull request.</p>
  
  <p>From what I've read on the internet there are two options for that:</p>
  
  <ol>
  <li>merge </li>
  <li>rebase</li>
  </ol>
  
  <p>However, I tried both of them but when I make pull request it shows that all files were changed in this pr.</p>
  
  <p>Here is what I did:</p>
  
  <p>on the branch</p>
  
  <pre><code>-- git commit -a -m "changes i made on my branch" 
  -- git checkout master
  -- git fetch upstream
  -- git merge upstream/master
  -- git checkout mybranch
  -- git merge master (or rebase)
  -- git push origin mybranch
  </code></pre>
  
  <p>result -- merge commit in the history shows files changes: 90</p>
  
  <p>What is the correct way to get updates from master into my branch?</p>
  
  <p>Similar situation happens when somebody reviews my pr and I need to update my pr. Once again, I end up needing the changes from master.</p>
  
  <p>Thanks for the help.</p>