<?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>Senthil Rajasekharan&#039;s Personal Blog - Meeting of Minds &#187; git</title>
	<atom:link href="http://blog.rajasekharan.com/category/software/git/feed/" rel="self" type="application/rss+xml" />
	<link>http://blog.rajasekharan.com</link>
	<description>And this too shall pass...</description>
	<lastBuildDate>Mon, 19 Dec 2011 02:45:28 +0000</lastBuildDate>
	<language>en</language>
	<sy:updatePeriod>hourly</sy:updatePeriod>
	<sy:updateFrequency>1</sy:updateFrequency>
	<generator>http://wordpress.org/?v=3.3</generator>
		<item>
		<title>Git Fast Forward</title>
		<link>http://blog.rajasekharan.com/2008/12/18/git-fast-forward/</link>
		<comments>http://blog.rajasekharan.com/2008/12/18/git-fast-forward/#comments</comments>
		<pubDate>Thu, 18 Dec 2008 18:40:09 +0000</pubDate>
		<dc:creator>senthil</dc:creator>
				<category><![CDATA[git]]></category>
		<category><![CDATA[Programming]]></category>
		<category><![CDATA[repository]]></category>
		<category><![CDATA[software]]></category>
		<category><![CDATA[Uncategorized]]></category>

		<guid isPermaLink="false">http://blog.rajasekharan.com/?p=103</guid>
		<description><![CDATA[git fast forward merge is a special case of a git merge. Check the Basic Branching and Merging section of the git community book for the definition. Here I present a case where non-fast forward merges were rejected by git and I had to fast forward a local branch to merge remote changes. &#62;git branch [...]]]></description>
			<content:encoded><![CDATA[<p>git fast forward merge is a special case of a git merge.</p>
<p>Check the <a href="http://book.git-scm.com/3_basic_branching_and_merging.html" title="Git - Basic Branching and Merging" target="_blank">Basic Branching and Merging</a> section of the <a href="http://book.git-scm.com/index.html" title="Git Community Book" target="_blank">git community book</a> for the definition.</p>
<p>Here I present a case where non-fast forward merges were rejected by git and I had to fast forward a local branch to merge remote changes.</p>
<p>&gt;git branch -a</p>
<p>* development</p>
<p>mylocal-branch</p>
<p>origin/development</p>
<p>&gt;git status</p>
<p># On branch development<br />
nothing to commit (working directory clean)<br />
&gt;git merge mylocal-branch (you want to merge from mylocal-branch to development branch )</p>
<p>&gt; git push &lt;repository | origin&gt; development</p>
<p>Works if the remote branch &#8216;development&#8217; has no simultaneous commits from a co-worker, say.</p>
<p>But fails with the following messages if there were simultaneous commits on the remote branch &#8216;development&#8217;</p>
<p>! [rejected]        development -&gt; development (non-fast forward)<br />
error: failed to push some refs to &#8216;&lt;your repository name&gt;&#8217;</p>
<p>Here is how to fix this scenario,</p>
<p>&gt; git pull &lt;repository | origin&gt; +development:development</p>
<p>The &#8216;+&#8217; option fast forwards the local &#8216;development&#8217; branch to the remote &#8216;development&#8217; branch</p>
<p>&gt; git merge mylocal-branch</p>
<p>At this point you have changes from the remote and local &#8216;development&#8217; branches merged</p>
<p>&gt; git push &lt;repository | origin&gt; development</p>
<p>The changes were now pushed to the repository without being rejected. This is one scenario where you can use fast forward to merge changes and synchronize local and remote branches.</p>
]]></content:encoded>
			<wfw:commentRss>http://blog.rajasekharan.com/2008/12/18/git-fast-forward/feed/</wfw:commentRss>
		<slash:comments>0</slash:comments>
		</item>
		<item>
		<title>If sudo apt-get install gitweb fails</title>
		<link>http://blog.rajasekharan.com/2008/07/21/if-sudo-apt-get-install-gitweb-fails/</link>
		<comments>http://blog.rajasekharan.com/2008/07/21/if-sudo-apt-get-install-gitweb-fails/#comments</comments>
		<pubDate>Tue, 22 Jul 2008 04:18:55 +0000</pubDate>
		<dc:creator>senthil</dc:creator>
				<category><![CDATA[git]]></category>
		<category><![CDATA[repository]]></category>
		<category><![CDATA[software]]></category>

		<guid isPermaLink="false">http://blog.rajasekharan.com/?p=12</guid>
		<description><![CDATA[Try sudo apt-get update]]></description>
			<content:encoded><![CDATA[<p>I hope this is useful to someone. I was trying to set up git and gitweb.</p>
<p>&gt;sudo apt-get install git-core</p>
<p>was successful but gitweb was not,</p>
<p>&gt;sudo apt-get install gitweb<br />
Reading package lists&#8230; Done<br />
Building dependency tree<br />
Reading state information&#8230; Done<br />
Package gitweb is not available, but is referred to by another package.<br />
This may mean that the package is missing, has been obsoleted, or<br />
is only available from another source<br />
E: Package gitweb has no installation candidate</p>
<p>If you get this error message,</p>
<p>Try sudo apt-get update</p>
<p>and then run</p>
<p>sudo apt-get install gitweb</p>
<p>This installed gitweb successfully.</p>
]]></content:encoded>
			<wfw:commentRss>http://blog.rajasekharan.com/2008/07/21/if-sudo-apt-get-install-gitweb-fails/feed/</wfw:commentRss>
		<slash:comments>0</slash:comments>
		</item>
	</channel>
</rss>

<!-- Dynamic Page Served (once) in 0.213 seconds -->

