<?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>Work. Play. Innovate. &#187; merge</title>
	<atom:link href="http://danielshipton.com/tag/merge/feed/" rel="self" type="application/rss+xml" />
	<link>http://danielshipton.com</link>
	<description>following open source principles in a not so open world</description>
	<lastBuildDate>Tue, 26 Jan 2010 22:46:20 +0000</lastBuildDate>
	<generator>http://wordpress.org/?v=2.8.6</generator>
	<language>en</language>
	<sy:updatePeriod>hourly</sy:updatePeriod>
	<sy:updateFrequency>1</sy:updateFrequency>
			<item>
		<title>Working With GIT&#039;s Subversion Support</title>
		<link>http://danielshipton.com/working-with-git-svn-subversion-support/134/</link>
		<comments>http://danielshipton.com/working-with-git-svn-subversion-support/134/#comments</comments>
		<pubDate>Mon, 25 Feb 2008 23:20:15 +0000</pubDate>
		<dc:creator>dshipton</dc:creator>
				<category><![CDATA[Open Source]]></category>
		<category><![CDATA[conflicts]]></category>
		<category><![CDATA[git]]></category>
		<category><![CDATA[git-svn]]></category>
		<category><![CDATA[merge]]></category>
		<category><![CDATA[rebase]]></category>
		<category><![CDATA[stash]]></category>
		<category><![CDATA[working]]></category>

		<guid isPermaLink="false">http://danielshipton.com/?p=3</guid>
		<description><![CDATA[1. Checkout source:
git-svn clone svn+ssh://path/to/trunk
2. Work Work Work then:
git commit (/path/to/file/or/dir/ or -a)
or
git add /path/to/file.extension
git commit (/path/to/file/or/dir/ or -a)
3. Repeat  Step 2 Ad nauseum
4. Sync up with svn repository again or to sync up any time(see 7 for stashing uncommitted changes):
git-svn rebase
5. If there are conflicts:
Fix offending file/files
git-add offending file/files
git-rebase --continue
6. Commit work back to [...]]]></description>
			<content:encoded><![CDATA[<p>1. Checkout source:</p>
<pre>git-svn clone svn+ssh://path/to/trunk</pre>
<p>2. Work Work Work then:</p>
<pre>git commit (/path/to/file/or/dir/ or -a)</pre>
<p>or</p>
<pre>git add /path/to/file.extension</pre>
<pre>git commit (/path/to/file/or/dir/ or -a)</pre>
<p>3. Repeat  Step 2 Ad nauseum</p>
<p>4. Sync up with svn repository again or to sync up any time(see 7 for stashing uncommitted changes):</p>
<pre>git-svn rebase</pre>
<p>5. If there are conflicts:<br />
Fix offending file/files</p>
<pre>git-add offending file/files</pre>
<pre>git-rebase --continue</pre>
<p>6. Commit work back to svn repository</p>
<pre> git-svn dcommit</pre>
<p>7. To sync with uncommitted local changes (stash, sync, restore stashed changes and delete stash)</p>
<pre> git-stash</pre>
<pre> git-svn rebase</pre>
<pre> git-stash apply</pre>
<pre> git-stash clear</pre>
]]></content:encoded>
			<wfw:commentRss>http://danielshipton.com/working-with-git-svn-subversion-support/134/feed/</wfw:commentRss>
		<slash:comments>0</slash:comments>
		</item>
	</channel>
</rss>
