<?xml version="1.0" encoding="UTF-8" ?>
<?xml-stylesheet type="text/xsl" href="http://codeprairie.net/utility/FeedStylesheets/rss.xsl" media="screen"?><rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:slash="http://purl.org/rss/1.0/modules/slash/" xmlns:wfw="http://wellformedweb.org/CommentAPI/"><channel><title>jeffg</title><link>http://codeprairie.net/blogs/jeffg/default.aspx</link><description /><dc:language>en</dc:language><generator>CommunityServer 2007.1 (Build: 20917.1142)</generator><item><title>Pushing Git Repo into SVN</title><link>http://codeprairie.net/blogs/jeffg/archive/2008/02/14/pushing-git-repo-into-svn.aspx</link><pubDate>Thu, 14 Feb 2008 23:14:00 GMT</pubDate><guid isPermaLink="false">73a4aa19-1c0c-4438-a31e-8c1402e1ba60:388</guid><dc:creator>jeffg</dc:creator><slash:comments>2</slash:comments><wfw:commentRss xmlns:wfw="http://wellformedweb.org/CommentAPI/">http://codeprairie.net/blogs/jeffg/rsscomments.aspx?PostID=388</wfw:commentRss><comments>http://codeprairie.net/blogs/jeffg/archive/2008/02/14/pushing-git-repo-into-svn.aspx#comments</comments><description>&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;</description><category domain="http://codeprairie.net/blogs/jeffg/archive/tags/Git+SVN/default.aspx">Git SVN</category></item></channel></rss>