title: Git merge branch into master
body: <p>I have a master branch and a working <code>branch_1</code>. I want to 'move' <code>branch_1</code> exactly as it is to <code>master</code>. So I want something like this:</p>
  
  <pre><code>git checkout master
  git merge branch_1 # I don't know what is correct...
  </code></pre>
  
  <p>Things which I did but I got loads of files messed up with annoying conflicts. So now master contains exactly the same files of <code>branch_1</code> avoiding any conflicts, just overwriting files.
  Any help?</p>