<?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>Tyler Weir &#187; sync forks</title>
	<atom:link href="http://www.praytothemachine.com/evil/tag/sync-forks/feed/" rel="self" type="application/rss+xml" />
	<link>http://www.praytothemachine.com/evil</link>
	<description>If it don&#039;t make dollars, then it don&#039;t make sense...</description>
	<lastBuildDate>Mon, 23 Jan 2012 16:13:16 +0000</lastBuildDate>
	<language>en</language>
	<sy:updatePeriod>hourly</sy:updatePeriod>
	<sy:updateFrequency>1</sy:updateFrequency>
	<generator>http://wordpress.org/?v=3.3.1</generator>
		<item>
		<title>Keeping a git fork in sync with the forked repo.</title>
		<link>http://www.praytothemachine.com/evil/2008/05/24/keeping-a-git-fork-in-sync-with-the-forked-repo/</link>
		<comments>http://www.praytothemachine.com/evil/2008/05/24/keeping-a-git-fork-in-sync-with-the-forked-repo/#comments</comments>
		<pubDate>Sat, 24 May 2008 10:51:14 +0000</pubDate>
		<dc:creator>Tyler</dc:creator>
				<category><![CDATA[General]]></category>
		<category><![CDATA[git]]></category>
		<category><![CDATA[sync forks]]></category>

		<guid isPermaLink="false">http://www.praytothemachine.com/evil/?p=718</guid>
		<description><![CDATA[I forked http://github.com/dpp/lift/tree/master to http://github.com/tjweir/lift/tree/master and I want to keep in sync with the update to dpp/lift. This is how I do it. In my repo add a remote reference to dpp/lift: $ git remote add dppmaster git://github.com/dpp/lift.git Fetch $ git fetch dppmaster This will create a branch, so then you just have to merge [...]]]></description>
			<content:encoded><![CDATA[<p>I forked <a href="http://github.com/dpp/lift/tree/master" rel="nofollow" onclick="pageTracker._trackPageview('/outgoing/github.com/dpp/lift/tree/master?referer=');">http://github.com/dpp/lift/tree/master</a> to <a href="http://github.com/tjweir/lift/tree/master" rel="nofollow" onclick="pageTracker._trackPageview('/outgoing/github.com/tjweir/lift/tree/master?referer=');">http://github.com/tjweir/lift/tree/master</a> and I want to keep in sync with the update to dpp/lift.  This is how I do it.</p>
<pre>
In my repo add a remote reference to dpp/lift:
$ git remote add dppmaster git://github.com/dpp/lift.git

Fetch
$ git fetch dppmaster

This will create a branch, so then you just have to merge back:
$ git checkout master
$ git merge dppmaster/master

Commit those new changes:
$ git commit -a -m "Sync to fork master"
</pre>]]></content:encoded>
			<wfw:commentRss>http://www.praytothemachine.com/evil/2008/05/24/keeping-a-git-fork-in-sync-with-the-forked-repo/feed/</wfw:commentRss>
		<slash:comments>0</slash:comments>
		</item>
	</channel>
</rss>

