<?xml version="1.0" encoding="UTF-8"?>
<rss version="2.0"
	xmlns:content="http://purl.org/rss/1.0/modules/content/"
	xmlns:wfw="http://wellformedweb.org/CommentAPI/"
	xmlns:dc="http://purl.org/dc/elements/1.1/"
	xmlns:atom="http://www.w3.org/2005/Atom"
	xmlns:sy="http://purl.org/rss/1.0/modules/syndication/"
	xmlns:slash="http://purl.org/rss/1.0/modules/slash/"
	>

<channel>
	<title>Floorplanner Tech Blog &#187; source code management</title>
	<atom:link href="http://techblog.floorplanner.com/tag/source-code-management/feed/" rel="self" type="application/rss+xml" />
	<link>http://techblog.floorplanner.com</link>
	<description>Our latest geek adventures!</description>
	<lastBuildDate>Tue, 16 Mar 2010 18:45:44 +0000</lastBuildDate>
	<generator>http://wordpress.org/?v=2.9.2</generator>
	<language>en</language>
	<sy:updatePeriod>hourly</sy:updatePeriod>
	<sy:updateFrequency>1</sy:updateFrequency>
			<item>
		<title>Using git-svn</title>
		<link>http://techblog.floorplanner.com/2008/07/11/using-git-svn/</link>
		<comments>http://techblog.floorplanner.com/2008/07/11/using-git-svn/#comments</comments>
		<pubDate>Fri, 11 Jul 2008 14:49:06 +0000</pubDate>
		<dc:creator>Willem van Bergen</dc:creator>
				<category><![CDATA[Collaboration]]></category>
		<category><![CDATA[Development]]></category>
		<category><![CDATA[git]]></category>
		<category><![CDATA[git-svn]]></category>
		<category><![CDATA[source code management]]></category>
		<category><![CDATA[subversion]]></category>

		<guid isPermaLink="false">http://techblog.floorplanner.com/?p=91</guid>
		<description><![CDATA[I personally am a fan of the git version control system. The best part of git is its speed, and the simplicity of using local branches.
Local branches are very helpful if you are working on different features at the same time but want to keep them apart. An example: it happens all the time that [...]]]></description>
			<content:encoded><![CDATA[<p>I personally am a fan of the <em>git</em> version control system. The best part of git is its speed, and the simplicity of using local branches.</p>
<p>Local branches are very helpful if you are working on different features at the same time but want to keep them apart. An example: it happens all the time that I am working on some feature and than I have to put my current work aside to work on a high priority issue. Once this issue is solved, I need to commit the changes and usually do a deploy of the web application so that the problem is solved as soon as possible. With Subversion, I sometimes commit files that were part of the unfinished feature I was working on before I started on the high priority issue. If I am not careful and deploy those files, unfinished work will be put into production and this can go horribly wrong, like every page request returning a 500-error of our high traffic site <img src='http://techblog.floorplanner.com/wp-includes/images/smilies/icon_sad.gif' alt=':(' class='wp-smiley' /> .</p>
<p>Using git, I can put my current work aside easily by using <code>git stash</code>. When I am finished with the high priority issue, I can revert to my previous work with <code>git stash apply</code>. </p>
<p>Another option: branching the project (using <code>git branch <em>feature</em></code>) if the feature I am working on is invasive and than switch branches for high priority issues using <code>git checkout master</code>. I can go back to the <em>feature</em> branch with <code>git checkout <em>feature</em></code>, followed by <code>git merge master</code> to merge back the changes I just made in the master branch. Branching and merging is very fast in git and merging is not the PITA like it is in Subversion.</p>
<p>However, our main code repository will probably remain in SVN for now. Luckily for me, I can use <em>git-svn</em> locally to profit from these advantages. I found <a href="http://www.aidanf.net/blog/2007/12/10/using-git-offline-commits-subversion-repository">an informative page</a> on installing and getting started with git-svn on OSX. If you know Subversion, <a href="http://git.or.cz/course/svn.html">this page</a> is helpful to translate Subversion commandos to their git alternatives.</p>
]]></content:encoded>
			<wfw:commentRss>http://techblog.floorplanner.com/2008/07/11/using-git-svn/feed/</wfw:commentRss>
		<slash:comments>0</slash:comments>
		</item>
	</channel>
</rss>
