<?xml version="1.0" encoding="UTF-8"?><rss version="2.0"
	xmlns:content="http://purl.org/rss/1.0/modules/content/"
	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/"
		>
<channel>
	<title>Comments on: Update a Github Fork from the Original Repo</title>
	<atom:link href="http://bradlyfeeley.com/2008/09/03/update-a-github-fork-from-the-original-repo/feed/" rel="self" type="application/rss+xml" />
	<link>http://bradlyfeeley.com/2008/09/03/update-a-github-fork-from-the-original-repo/</link>
	<description>San Diego Ruby on Rails Developer</description>
	<lastBuildDate>Fri, 26 Apr 2013 10:14:18 +0000</lastBuildDate>
	<sy:updatePeriod>hourly</sy:updatePeriod>
	<sy:updateFrequency>1</sy:updateFrequency>
	<generator>http://wordpress.org/?v=3.5.1</generator>
	<item>
		<title>By: Michael Caputo</title>
		<link>http://bradlyfeeley.com/2008/09/03/update-a-github-fork-from-the-original-repo/comment-page-1/#comment-101148</link>
		<dc:creator>Michael Caputo</dc:creator>
		<pubDate>Fri, 26 Apr 2013 10:14:18 +0000</pubDate>
		<guid isPermaLink="false">http://bradlyfeeley.com/?p=10#comment-101148</guid>
		<description><![CDATA[Thanks a lot for this!]]></description>
		<content:encoded><![CDATA[<p>Thanks a lot for this!</p>
]]></content:encoded>
	</item>
	<item>
		<title>By: visine pimple</title>
		<link>http://bradlyfeeley.com/2008/09/03/update-a-github-fork-from-the-original-repo/comment-page-1/#comment-95593</link>
		<dc:creator>visine pimple</dc:creator>
		<pubDate>Tue, 26 Mar 2013 09:39:01 +0000</pubDate>
		<guid isPermaLink="false">http://bradlyfeeley.com/?p=10#comment-95593</guid>
		<description><![CDATA[Hey there! I could have sworn I&#039;ve been to this site before but after reading through some of the post I realized it&#039;s new to me.
Nonetheless, I&#039;m definitely delighted I found it and I&#039;ll be book-marking and checking back often!]]></description>
		<content:encoded><![CDATA[<p>Hey there! I could have sworn I&#8217;ve been to this site before but after reading through some of the post I realized it&#8217;s new to me.<br />
Nonetheless, I&#8217;m definitely delighted I found it and I&#8217;ll be book-marking and checking back often!</p>
]]></content:encoded>
	</item>
	<item>
		<title>By: ArthurHoaro</title>
		<link>http://bradlyfeeley.com/2008/09/03/update-a-github-fork-from-the-original-repo/comment-page-1/#comment-88575</link>
		<dc:creator>ArthurHoaro</dc:creator>
		<pubDate>Fri, 15 Feb 2013 16:06:51 +0000</pubDate>
		<guid isPermaLink="false">http://bradlyfeeley.com/?p=10#comment-88575</guid>
		<description><![CDATA[I know this post is quite old, but is there a way to do that for a specific commit from the original repo ?]]></description>
		<content:encoded><![CDATA[<p>I know this post is quite old, but is there a way to do that for a specific commit from the original repo ?</p>
]]></content:encoded>
	</item>
	<item>
		<title>By: youtube.com</title>
		<link>http://bradlyfeeley.com/2008/09/03/update-a-github-fork-from-the-original-repo/comment-page-1/#comment-74977</link>
		<dc:creator>youtube.com</dc:creator>
		<pubDate>Sat, 19 Jan 2013 03:34:09 +0000</pubDate>
		<guid isPermaLink="false">http://bradlyfeeley.com/?p=10#comment-74977</guid>
		<description><![CDATA[Hello, i think that i saw you visited my blog thus i came 
to “return the favor”.I&#039;m attempting to find things to enhance my web site!I suppose its ok to use a few of your ideas!!]]></description>
		<content:encoded><![CDATA[<p>Hello, i think that i saw you visited my blog thus i came<br />
to “return the favor”.I&#8217;m attempting to find things to enhance my web site!I suppose its ok to use a few of your ideas!!</p>
]]></content:encoded>
	</item>
	<item>
		<title>By: spekary</title>
		<link>http://bradlyfeeley.com/2008/09/03/update-a-github-fork-from-the-original-repo/comment-page-1/#comment-73388</link>
		<dc:creator>spekary</dc:creator>
		<pubDate>Wed, 16 Jan 2013 18:59:47 +0000</pubDate>
		<guid isPermaLink="false">http://bradlyfeeley.com/?p=10#comment-73388</guid>
		<description><![CDATA[So, I did what was suggested, I:
- pulled changes
- merged
- pushed to my fork
- made some changes
-pushed again to my fork
-made a pull request

However, the pull request shows all the commits that were merged from the first pull. Is that a problem? It appears like I am adding files that are already there. The files changed says 1, so that is correct, but its all the old commits that I didn&#039;t make, but that were part of the merge, that are bothering me.]]></description>
		<content:encoded><![CDATA[<p>So, I did what was suggested, I:<br />
- pulled changes<br />
- merged<br />
- pushed to my fork<br />
- made some changes<br />
-pushed again to my fork<br />
-made a pull request</p>
<p>However, the pull request shows all the commits that were merged from the first pull. Is that a problem? It appears like I am adding files that are already there. The files changed says 1, so that is correct, but its all the old commits that I didn&#8217;t make, but that were part of the merge, that are bothering me.</p>
]]></content:encoded>
	</item>
	<item>
		<title>By: Master in contract</title>
		<link>http://bradlyfeeley.com/2008/09/03/update-a-github-fork-from-the-original-repo/comment-page-1/#comment-70736</link>
		<dc:creator>Master in contract</dc:creator>
		<pubDate>Fri, 11 Jan 2013 23:59:21 +0000</pubDate>
		<guid isPermaLink="false">http://bradlyfeeley.com/?p=10#comment-70736</guid>
		<description><![CDATA[Greetings from Carolina! I&#039;m bored to tears at work so I decided to check out your blog on my iphone during lunch break. I really like the knowledge you present here and can&#039;t wait to take a look when I get home.
I&#039;m surprised at how fast your blog loaded on my phone .. I&#039;m not even using WIFI, just 3G 
.. Anyhow, wonderful site!]]></description>
		<content:encoded><![CDATA[<p>Greetings from Carolina! I&#8217;m bored to tears at work so I decided to check out your blog on my iphone during lunch break. I really like the knowledge you present here and can&#8217;t wait to take a look when I get home.<br />
I&#8217;m surprised at how fast your blog loaded on my phone .. I&#8217;m not even using WIFI, just 3G<br />
.. Anyhow, wonderful site!</p>
]]></content:encoded>
	</item>
	<item>
		<title>By: Mike Schinkel</title>
		<link>http://bradlyfeeley.com/2008/09/03/update-a-github-fork-from-the-original-repo/comment-page-1/#comment-27881</link>
		<dc:creator>Mike Schinkel</dc:creator>
		<pubDate>Thu, 13 Sep 2012 00:00:19 +0000</pubDate>
		<guid isPermaLink="false">http://bradlyfeeley.com/?p=10#comment-27881</guid>
		<description><![CDATA[Excellent post, thanks so much!  As someone who still really struggles with Git and GitHub (though comfortable with hg and BitBucket) this really helped and saved me lots of head scratching.

One suggestion though: add in the &quot;git push&quot; command as an update to the post because like @Joe I don&#039;t know Git well enough to know that was the command that was required (but  thanks to @Steve Piercy for making it clear.)]]></description>
		<content:encoded><![CDATA[<p>Excellent post, thanks so much!  As someone who still really struggles with Git and GitHub (though comfortable with hg and BitBucket) this really helped and saved me lots of head scratching.</p>
<p>One suggestion though: add in the &#8220;git push&#8221; command as an update to the post because like @Joe I don&#8217;t know Git well enough to know that was the command that was required (but  thanks to @Steve Piercy for making it clear.)</p>
]]></content:encoded>
	</item>
	<item>
		<title>By: noisebleed</title>
		<link>http://bradlyfeeley.com/2008/09/03/update-a-github-fork-from-the-original-repo/comment-page-1/#comment-21491</link>
		<dc:creator>noisebleed</dc:creator>
		<pubDate>Sun, 01 Jul 2012 16:57:59 +0000</pubDate>
		<guid isPermaLink="false">http://bradlyfeeley.com/?p=10#comment-21491</guid>
		<description><![CDATA[Easy and clean. Thanks!]]></description>
		<content:encoded><![CDATA[<p>Easy and clean. Thanks!</p>
]]></content:encoded>
	</item>
	<item>
		<title>By: Marc Limotte</title>
		<link>http://bradlyfeeley.com/2008/09/03/update-a-github-fork-from-the-original-repo/comment-page-1/#comment-19096</link>
		<dc:creator>Marc Limotte</dc:creator>
		<pubDate>Mon, 04 Jun 2012 16:34:07 +0000</pubDate>
		<guid isPermaLink="false">http://bradlyfeeley.com/?p=10#comment-19096</guid>
		<description><![CDATA[Very helpful.   I did &#039;git pull my-remote-master&#039; instead for the second step.  Works great.

Marc]]></description>
		<content:encoded><![CDATA[<p>Very helpful.   I did &#8216;git pull my-remote-master&#8217; instead for the second step.  Works great.</p>
<p>Marc</p>
]]></content:encoded>
	</item>
	<item>
		<title>By: Working on my birthday &#171; Fijiaaron in Ecuador</title>
		<link>http://bradlyfeeley.com/2008/09/03/update-a-github-fork-from-the-original-repo/comment-page-1/#comment-18740</link>
		<dc:creator>Working on my birthday &#171; Fijiaaron in Ecuador</dc:creator>
		<pubDate>Thu, 31 May 2012 20:03:43 +0000</pubDate>
		<guid isPermaLink="false">http://bradlyfeeley.com/?p=10#comment-18740</guid>
		<description><![CDATA[[...] the balcony all morning. He was working on the expense list view with local storage and I worked on merging the client and server code base and getting the development server set up with SSL and an Apache / Node.js proxy [...]]]></description>
		<content:encoded><![CDATA[<p>[...] the balcony all morning. He was working on the expense list view with local storage and I worked on merging the client and server code base and getting the development server set up with SSL and an Apache / Node.js proxy [...]</p>
]]></content:encoded>
	</item>
</channel>
</rss>
