title: Merging changes from master into my branch
body: <p>I have two branches in git: <code>master</code> and <code>custom_branch</code>.</p>
  
  <p>Somebody added some code to <code>master</code> that I need to use in my <code>custom_branch</code>. I tried this:</p>
  
  <pre><code>git branch custom_branch
  git merge master
  </code></pre>
  
  <p>But when I do that, it says:</p>
  
  <pre><code>Already up-to-date.
  </code></pre>
  
  <p>But, when I compare <code>master</code> and <code>custom_branch</code>, the changes are still not there. What am I missing?</p>
  
  <p>P.S. I don't want to <code>rebase</code> since other people also use this branch.</p>