title: Merging branches With Git
body: <p>I am using git for windows to manage a local project. I have two branches, 'master' and 'change_specific'. I have added some extra files to 'change_specific'. Those files don't show up when I switch to 'master'. When I call </p>
  
  <pre><code>git merge -m "don't need old branch" master change_specific
  </code></pre>
  
  <p>git tells me "Already up-to-date. Yeeah!". Yet the branches seem to have different files. I would like to delete 'change_specific' and be done with it, yet I am afraid that will wipe out my added files - a bad thing. It seems there is something I missed when I scanned the git documentation. <strong>What is going on and what should I do?</strong></p>