title: Merge un-tracked folder into a tracked Git repository
body: <p>I've recently moved all my projects over from Subversion to Git. Thinking everything was all fine and dandy, I continued on developing one of my projects like usual without realising (until now), that I had been modifying the files in the old project directory instead of the new Git tracked directory.</p>
  
  <p>The Git repo is upto date and has every commit including the commit used in the working directory of the old project.</p>
  
  <p><strong>EDIT:</strong> To clarify, both folders have identical structure and code, simply one has changes that are newer than the HEAD of the Git repo. (The Git Repo has not had any changes to it since).</p>
  
  <p>Is it possible, and how do I, merge changes from my other, untracked folder, into my new Git tracked folder? I want to merge the changes in without messing too much up. What would suggest?</p>