title: Importing an SVN Repo into an EXISTING Git repo as a branch
body: <p>I've currently got a project on google code that I'd like to incorporate into a project on Github.</p>
  
  <p>The issue is that the SVN project is essentially just a folder of the larger project on github, so I don't think i can just use git-svn for this.</p>
  
  <p>I'm assuming I can use git svn to clone the project, but then i'm not sure how to graft the svn project onto the existing git project properly.</p>
  
  <p>The desired outcome would be to get the SVN history into a Git branch (not graft it onto master).</p>
  
  <p>Being able to dcommit back to svn isn't really necessary (if that helps).</p>
  
  <p><em>SOLVED</em></p>
  
  <p>I ended up using just_doug's suggestion, but with some minor modifications:</p>
  
  <p>1: I used the suggestions from <a href="http://ivanz.com/2009/01/15/selective-import-of-svn-branches-into-a-gitgit-svn-repository/">http://ivanz.com/2009/01/15/selective-import-of-svn-branches-into-a-gitgit-svn-repository/</a> to add googlecode as a remote ref</p>
  
  <p>2: I create a new branch off of master for the remote branch i wanted</p>
  
  <p>3: I used </p>
  
  <blockquote>
    <p>git merge -s ours --no-commit <em>googlecode-remote</em></p>
  </blockquote>
  
  <p>to merge the two</p>
  
  <p>4: I then used</p>
  
  <blockquote>
    <p>git read-tree --prefix=<em>folder1/folder2/</em> -u <em>googlecode-remote</em></p>
  </blockquote>
  
  <p>to read in the merge history and rebase to the desired subfolder</p>
  
  <p>hopefully this helps someone in a similar situation ;)</p>