title: Git uncommit message only
body: <p>I'm in this scenario pretty often and I don't know what to do.</p>
  
  <ol>
  <li>I was changed something in a branch. Commited &amp; pushed.</li>
  <li>I was still working on same branch and somebody commited &amp; pushed.</li>
  <li>I was done changing and did <strong>git commit -m "Blabla"</strong> and pushed.</li>
  <li>Git refused to push because repository is ahead and I may loose some changes</li>
  </ol>
  
  <p>My idea is to:</p>
  
  <ul>
  <li>Go pre <strong>git commit -m "blabla"</strong> (&lt;- this is where I'm stuck)</li>
  <li>stash changes</li>
  <li>Pull latest changes from repo</li>
  <li>Merge stash with working directory</li>
  <li>Commit once more</li>
  <li>Push</li>
  </ul>
  
  <p>How do you resolve such "conflicts", or what is the best thing to do in this situation?</p>