<?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>Meeting of Minds &#187; repository</title>
	<atom:link href="http://blog.rajasekharan.com/category/software/repository/feed/" rel="self" type="application/rss+xml" />
	<link>http://blog.rajasekharan.com</link>
	<description>And this too shall pass...</description>
	<lastBuildDate>Tue, 20 Apr 2010 20:09:31 +0000</lastBuildDate>
	<generator>http://wordpress.org/?v=2.8.3</generator>
	<language>en</language>
	<sy:updatePeriod>hourly</sy:updatePeriod>
	<sy:updateFrequency>1</sy:updateFrequency>
			<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[Programming]]></category>
		<category><![CDATA[Uncategorized]]></category>
		<category><![CDATA[git]]></category>
		<category><![CDATA[repository]]></category>
		<category><![CDATA[software]]></category>

		<guid isPermaLink="false">http://blog.rajasekharan.com/?p=103</guid>
		<description><![CDATA[&#62;git branch -a
* development
mylocal-branch
origin/development
&#62;git status
# On branch development
nothing to commit (working directory clean)
&#62;git merge mylocal-branch (you want to merge from mylocal-branch to development branch )
&#62; git push &#60;repository &#124; origin&#62; development
Works if the remote branch &#8216;development&#8217; has no simultaneous commits from a co-worker, say.
But fails with the following messages if there were simultaneous commits on [...]]]></description>
			<content:encoded><![CDATA[<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 bring local and remote branches upto date.</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.210 seconds -->
