title: Problem merging branch into master in git
body: <p>I have a master with files A, B, C
  I have a branch called 'feature' with files: D,E,F.</p>
  
  <p>Yes my branch was NOT cut off of my master, so the files are nothing alike between branch and master.</p>
  
  <p>Now I want to essentially replace the content of my master with what's in branch.</p>
  
  <p>What can I do?</p>