title: Fix git "not currently on any branch" after merge conflicts
body: <p>I tried to commit the changes. After a lot of problems and conflicts, I managed to resolved every problem. However, the code I committed is not currently on any branch (as the <code>git status</code> shows). How can I fix this problem? I tried several solutions but none worked for me. I tried the command <code>git merge</code> but it says it's already up to date.</p>
  <h3>Update</h3>
  <p>The result of <code>git log --all --graph --oneline --decorate</code> is:</p>
  <pre><code>* 7833c31 (HEAD) Changed LI tool
  * c205a25 Fixed merge conflicts
  *   7b10e48 (vsproj/master, master) 4-7-2013
  |\  
  | * cc51cb0 3/9/2013
  | * 62ea718 Updated mail and added barcode
  | * 9a3573a 1-7-2013
  | * 96ded0e Updated ExamsPrinter
  | * be6638a 12-25-2012
  | * 89cba4b Added HTML to PDF and updated Email app
  | * fa96aeb Updates
  | * 9ffcfcc Changes in CloudDownloader, LinkedIn &amp; Twitter apps
  | * 609c555 Added README file
  | * bf8a344 Started implementing CloudDownloader, created FileDownloader, updated FacebookInfoBot
  | * c3556ce First Commit
  * 3a59cd5 4-7-2013
  </code></pre>