title: How to `git reset` After `git merge --no-commit --no-ff`
body: <p>I am a newbie to git.
  I was working on a branch that involved lot of moving around of the code, including deletion of old and addition of new files. Therefore I decided to do a dry-run of git merge before actually merging:</p>
  
  <p>I ran <code>git merge --no-commit --no-ff &lt;myBranchName&gt;</code>. After I ran this, it showed me some conflicts. Then I did git status and result was: </p>
  
  <pre><code>My-Macbook-pro:[master] $ git status
  # On branch master
  # You have unmerged paths.
  #   (fix conflicts and run "git commit")
  #
  # Changes to be committed:
  #   modified:   common/TP.php
  #   deleted:    common/model/Job/Request.php
  #   new file:   common/DP.php
  #
  # Unmerged paths:
  #   (use "git add/rm &lt;file&gt;..." as appropriate to mark resolution)
  #
  #   both modified:      .gitignore
  #   both added:         build/release/current/production.sql
  #   deleted by them:    common/Service/DFPASPAdapter.php
  #   both modified:      common/Ze.php
  #   deleted by them:    common/model/provider/DFPASP.php
  </code></pre>
  
  <p>Then to undo <code>git add</code>(which happened because of the <code>git merge</code> dry run), I ran <code>git reset HEAD</code>. But later on I realized/learnt that in order to get back to the stage the master branch was in before merge(ie exactly same as what is committed to master), I will need to run <code>git reset --hard HEAD</code>
  After I ran the hard reset, <code>git status</code> shows the following:</p>
  
  <pre><code># On branch master
  # Untracked files:
  #   (use "git add &lt;file&gt;..." to include in what will be committed)
  #
  #   build/release/current/upgrade.php
  #   common/F1.php
  #   common/F2.php
  #   common/F3.php
  nothing added to commit but untracked files present (use "git add" to track)
  </code></pre>
  
  <p>The above files F1, F2, F3 and upgrade.php were added in the branch that I was working on. I was hoping that <code>git reset --hard HEAD</code> will make the <code>master</code> branch forget about anything related to the branch I was trying to merge (dry run).</p>
  
  <p>Is this something that is possible? 
  Is there something I am missing in the concept? And am I left with the only option of removing the files manually? 
  Any help in making me understand more will be great! 
  Thanks!</p>