title: Git undo merge attempt
body: <p>I have working directory (#1) which has vendor directory(#2) in it. There is one dependency which I wanted to pull manually without composer (php version of npm/gem). I was working in #1, haven't saved/commited changes, when I decided I want to update library in #2. I navigated to vendor/myname, and did git pull repository.</p>
  
  <p>Unfortunately it started to pull and merge to #1, instead of creating new directory in vendor folder.</p>
  
  <p>Now I have:</p>
  
  <ul>
  <li>#1 folder with my changes</li>
  <li>#1 folder with files I don't want from wrong repository</li>
  <li>#1 merge conflicts such as composer.json, Readme.md... (general files)</li>
  </ul>
  
  <p>I want to "undo" this last git pull without loosing any changes I did to folder #1. How can I do this?</p>