<?xml version="1.0" encoding="UTF-8" ?>
<?xml-stylesheet type="text/xsl" href="http://codeprairie.net/utility/FeedStylesheets/atom.xsl" media="screen"?><feed xmlns="http://www.w3.org/2005/Atom" xml:lang="en"><title type="html">jeffg</title><subtitle type="html" /><id>http://codeprairie.net/blogs/jeffg/atom.aspx</id><link rel="alternate" type="text/html" href="http://codeprairie.net/blogs/jeffg/default.aspx" /><link rel="self" type="application/atom+xml" href="http://codeprairie.net/blogs/jeffg/atom.aspx" /><generator uri="http://communityserver.org" version="3.1.20917.1142">Community Server</generator><updated>2008-02-14T15:14:00Z</updated><entry><title>Pushing Git Repo into SVN</title><link rel="alternate" type="text/html" href="http://codeprairie.net/blogs/jeffg/archive/2008/02/14/pushing-git-repo-into-svn.aspx" /><id>http://codeprairie.net/blogs/jeffg/archive/2008/02/14/pushing-git-repo-into-svn.aspx</id><published>2008-02-14T23:14:00Z</published><updated>2008-02-14T23:14:00Z</updated><content type="html">&lt;p&gt;The last time I hooked Git and SVN together, I first did all my set up work in SVN (Tortoise). Running git svn clone hooked things together. Since I love Git so much more than SVN, this seems a bit backwards so let&amp;#39;s set things up the other way around. &lt;/p&gt;&lt;p&gt;cd c:&lt;/p&gt;&lt;p&gt;cd Develop&lt;/p&gt;&lt;p&gt;mkdir Project&lt;/p&gt;&lt;p&gt;cd Project&amp;nbsp;&lt;/p&gt;&lt;p&gt;git init&lt;br /&gt;&lt;/p&gt;&lt;p&gt;git st //Shows that we are starting out on a branch called master&amp;nbsp;&lt;/p&gt;&lt;p&gt;Open up VS2008, created my solution and projects&lt;/p&gt;&lt;p&gt;vi .gitignore&amp;nbsp; //Add in my files to ignore &lt;br /&gt;&lt;/p&gt;&lt;p&gt;git add .&lt;/p&gt;&lt;p&gt;git ci&lt;/p&gt;&lt;p&gt;Open up Tortoise, create Project, Project/trunk, Project/branches, Project/tags //Wishing I didn&amp;#39;t have to touch Tortoise... Advice?&lt;br /&gt;&lt;/p&gt;&lt;p&gt;git svn init https://central/svn/repos/Project -T trunk -b branches -t tags&lt;/p&gt;&lt;p&gt;git svn fetch&lt;/p&gt;&lt;p&gt;git co -b svn/import trunk&lt;/p&gt;&lt;p&gt;git merge master&lt;br /&gt;&lt;/p&gt;&lt;p&gt;git svn dcommit&amp;nbsp;&lt;/p&gt;&lt;p&gt;&lt;br /&gt;Is there a better way? I&amp;#39;m not sure that git merge is the right way to go... &amp;nbsp;&lt;/p&gt;&lt;img src="http://codeprairie.net/aggbug.aspx?PostID=388" width="1" height="1"&gt;</content><author><name>jeffg</name><uri>http://codeprairie.net/members/jeffg.aspx</uri></author><category term="Git SVN" scheme="http://codeprairie.net/blogs/jeffg/archive/tags/Git+SVN/default.aspx" /></entry></feed>