title: git conflict keep original upstream
body: <p>I made a copy of a repo from github. Was just playing around the code a bit, made a branch committed that changes locally and now the original code is updated,so I want to delete whatever I did to my fork and get changes made by the upstream.</p>
  
  <p>I get a conflict if I do</p>
  
  <pre><code>git fetch upstream
  git merge upstream/master
  #Automatic merge failed; fix conflicts and then commit the result.
  </code></pre>
  
  <p>and gives in two file names showing few changes which I never did.</p>
  
  <p>So I did a git status which gives me a new filename(which I never made but was made by my upstream) and Unmerged paths:</p>
  
  <pre><code>#   (use "git add/rm &lt;file&gt;..." as appropriate to mark resolution)
  </code></pre>
  
  <p>for two files.</p>
  
  <p>I want all the new changes and destroy mine. What could possibly be the solution and why does GIT wants me to add a file I never made?</p>