title: On conflict, GitHub for Windows puts me in "rebasing" state, how to go from there?
body: <p>I recently started using <a href="http://windows.github.com">GitHub for Windows</a>.</p>
  
  <p>I just got a conflict. On command line I would know how to handle this, but GitHub for Windows choosed to put me in a state I am not familiar with:</p>
  
  <pre><code>C:\Users\w\Documents\GitHub\CmisSync [(6026d18...)|REBASE +0 ~1 -0 !1 | +0 ~0 -0 !1]&gt; git status
  # Not currently on any branch.
  # You are currently rebasing.
  #   (fix conflicts and then run "git rebase --continue")
  #   (use "git rebase --skip" to skip this patch)
  #   (use "git rebase --abort" to check out the original branch)
  #
  # Changes to be committed:
  #   (use "git reset HEAD &lt;file&gt;..." to unstage)
  ...
  </code></pre>
  
  <p>I fixed the conflict, committed the files, but when I run <code>git push</code> I am told:</p>
  
  <pre><code>fatal: You are not currently on a branch.
  To push the history leading to the current (detached HEAD) state now, use
  
      git push origin HEAD:&lt;name-of-remote-branch&gt;
  </code></pre>
  
  <p>What is the recommended way to get my merging commits to the remote master?<br>
  I doubt <code>git push origin HEAD:master</code> will achieve this.</p>