title: difference between git merge origin/master and git pull
body: <p>I'm working on a local branch "BDD-local" and would like to get the changes from other developers. 
  The other developers are using their own branch and once they are happy with the unit tests, they push the changes to remote repo (origin/master).</p>
  
  <p>I was going through several posts here and getting conflicting information.
  Few people talk about using:</p>
  
  <pre><code>git fetch origin
  git merge origin/master
  </code></pre>
  
  <p>Some others think, 'git pull' should get the changes.</p>
  
  <p>One of our developers asked to use 'git merge origin/master' without the 'git fetch'</p>
  
  <p>Does anyone know which of these options is better. I tried 'git pull' on my local branch but it didn't seem to work. But if I do 'git pull' on local master it works fine (however I want it to work for the local branch)</p>