<?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>CS8 &#187; git-merge</title>
	<atom:link href="http://www.cs8.my/tag/git-merge/feed/" rel="self" type="application/rss+xml" />
	<link>http://www.cs8.my</link>
	<description>Rapid Web Applications Done The Right Way!</description>
	<lastBuildDate>Thu, 02 Feb 2012 20:02:59 +0000</lastBuildDate>
	<language>en</language>
	<sy:updatePeriod>hourly</sy:updatePeriod>
	<sy:updateFrequency>1</sy:updateFrequency>
	<generator>http://wordpress.org/?v=3.2.1</generator>
		<item>
		<title>Git. Make sure branch is updated</title>
		<link>http://www.cs8.my/2008/07/git-make-sure-branch-is-updated/</link>
		<comments>http://www.cs8.my/2008/07/git-make-sure-branch-is-updated/#comments</comments>
		<pubDate>Wed, 02 Jul 2008 15:09:07 +0000</pubDate>
		<dc:creator>fadhli</dc:creator>
				<category><![CDATA[git]]></category>
		<category><![CDATA[git branch]]></category>
		<category><![CDATA[git-merge]]></category>
		<category><![CDATA[git-rebase]]></category>

		<guid isPermaLink="false">http://bugsneedfix.wordpress.com/?p=39</guid>
		<description><![CDATA[I had to make sure my git branch is updated with my master. So at my master branch git pull master Next, I switched to my branch named &#8216;feature_super_tag&#8217;. git checkout feature_super_tag and then git rebase master A good explanation of what a rebase does is from these two blogs: http://jbowes.dangerouslyinc.com/2007/01/26/git-rebase-keeping-your-branches-current/ http://adam.blog.heroku.com/past/2008/6/30/rebasing_is_editing_commits/ Note: It&#8217;s a [...]]]></description>
		<wfw:commentRss>http://www.cs8.my/2008/07/git-make-sure-branch-is-updated/feed/</wfw:commentRss>
		<slash:comments>0</slash:comments>
		</item>
	</channel>
</rss>

