title: Git - Merge vs rebase
body: <p>I have had a look at <a href="https://stackoverflow.com/questions/804115/git-rebase-vs-git-merge">When do you use git rebase instead of git merge?
  </a>.  </p>
  
  <p>But I'd like to be sure about which solution to choose in this case:</p>
  
  <p>I want to implement a new feature on <code>master</code> so I branch it to a new Feature branch.<br>
  I do 10 commits on Feature while someone else does other commits on Master.</p>
  
  <p>My question is if I want to keep my branch apart from Master for testing purposes, but I need to test it with the new Master commits integrated.
  So, should I merge Master into Feature (and not Feature into Master which would apply my modifications on master before my testing) or do a <code>rebase</code>?</p>