<?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/"
	>

<channel>
	<title>Mike G's Life</title>
	<atom:link href="http://www.mgimena.com/feed/" rel="self" type="application/rss+xml" />
	<link>http://www.mgimena.com</link>
	<description>the daily endeavor...</description>
	<pubDate>Thu, 27 May 2010 16:21:43 +0000</pubDate>
	<generator>http://wordpress.org/?v=2.7</generator>
	<language>en</language>
	<sy:updatePeriod>hourly</sy:updatePeriod>
	<sy:updateFrequency>1</sy:updateFrequency>
			<item>
		<title>Fixing Ruby no such file to load readline error in centOS</title>
		<link>http://www.mgimena.com/2010/05/27/fixing-ruby-no-such-file-to-load-readline-error-in-centos/</link>
		<comments>http://www.mgimena.com/2010/05/27/fixing-ruby-no-such-file-to-load-readline-error-in-centos/#comments</comments>
		<pubDate>Thu, 27 May 2010 16:21:43 +0000</pubDate>
		<dc:creator>admin</dc:creator>
		
		<category><![CDATA[IT Related]]></category>

		<category><![CDATA[Ruby on Rails]]></category>

		<guid isPermaLink="false">http://www.mgimena.com/?p=67</guid>
		<description><![CDATA[Does this error message look familar when you script/console?

$&#62; script/console
Loading production environment (Rails 2.1.0)
/usr/lib/ruby/1.8/irb/completion.rb:10:in `require': no such file to load -- readline (LoadError)
from /usr/lib/ruby/1.8/irb/completion.rb:10
from /usr/lib/ruby/1.8/irb/init.rb:252:in `require'
from /usr/lib/ruby/1.8/irb/init.rb:252:in `load_modules'
from /usr/lib/ruby/1.8/irb/init.rb:250:in `each'
from /usr/lib/ruby/1.8/irb/init.rb:250:in `load_modules'
from /usr/lib/ruby/1.8/irb/init.rb:21:in `setup'
from /usr/lib/ruby/1.8/irb.rb:54:in `start'
from /usr/bin/irb:13
This happens when readline is somehow different than your current version of ruby or corrupted. The quick fix is [...]]]></description>
			<content:encoded><![CDATA[<p>Does this error message look familar when you script/console?</p>
<p><code><br />
$&gt; script/console<br />
Loading production environment (Rails 2.1.0)<br />
/usr/lib/ruby/1.8/irb/completion.rb:10:in `require': no such file to load -- readline (LoadError)<br />
from /usr/lib/ruby/1.8/irb/completion.rb:10<br />
from /usr/lib/ruby/1.8/irb/init.rb:252:in `require'<br />
from /usr/lib/ruby/1.8/irb/init.rb:252:in `load_modules'<br />
from /usr/lib/ruby/1.8/irb/init.rb:250:in `each'<br />
from /usr/lib/ruby/1.8/irb/init.rb:250:in `load_modules'<br />
from /usr/lib/ruby/1.8/irb/init.rb:21:in `setup'<br />
from /usr/lib/ruby/1.8/irb.rb:54:in `start'<br />
from /usr/bin/irb:13</code></p>
<p>This happens when readline is somehow different than your current version of ruby or corrupted. The quick fix is to recompile readline. To do it in CentOS with yum:</p>
<p><code><br />
$&gt; yum install readline-devel -y<br />
$&gt; cd /root/src/ruby-1.8.6-p114/ext/readline/<br />
$&gt; ruby extconf.rb<br />
$&gt; make<br />
$&gt; sudo make install<br />
</code></p>
<p>Now you should have script/console working.</p>
<p>Source: <a href="http://web.elctech.com/2009/01/09/fixing-ruby-no-such-file-to-load-readline-error-in-centos/">http://web.elctech.com/2009/01/09/fixing-ruby-no-such-file-to-load-readline-error-in-centos/</a></p>
]]></content:encoded>
			<wfw:commentRss>http://www.mgimena.com/2010/05/27/fixing-ruby-no-such-file-to-load-readline-error-in-centos/feed/</wfw:commentRss>
		</item>
		<item>
		<title>how to enable flash audio in ubuntu</title>
		<link>http://www.mgimena.com/2010/04/19/how-to-enable-flash-audio-in-ubuntu/</link>
		<comments>http://www.mgimena.com/2010/04/19/how-to-enable-flash-audio-in-ubuntu/#comments</comments>
		<pubDate>Mon, 19 Apr 2010 06:35:38 +0000</pubDate>
		<dc:creator>admin</dc:creator>
		
		<category><![CDATA[IT Related]]></category>

		<category><![CDATA[flash audio]]></category>

		<category><![CDATA[ubuntu]]></category>

		<guid isPermaLink="false">http://www.mgimena.com/?p=61</guid>
		<description><![CDATA[source : http://ubuntuforums.org/showthread.php?t=789578
1. Backup (and then delete) your previous configuration files:
Code:
$ mkdir ~/pulse-backup &#38;&#38; cp -r ~/.pulse ~/.asound* /etc/asound.conf /etc/pulse -t ~/pulse-backup/
$ rm -r ~/.pulse ~/.asound*
$ sudo rm /etc/asound.conf
2. Ensure you have the necessary PulseAudio libraries and configuration utilities installed:
Code:
 $ sudo apt-get install libasound2-plugins padevchooser libsdl1.2debian-pulseaudio
3. Ensure the evil &#8220;libflashsupport&#8221; library is not installed:
Code:
$ [...]]]></description>
			<content:encoded><![CDATA[<p>source : <a href="http://ubuntuforums.org/showthread.php?t=789578">http://ubuntuforums.org/showthread.php?t=789578</a></p>
<p>1. Backup (and then delete) your previous configuration files:<br />
Code:</p>
<pre class="alt2" style="border: 1px inset; margin: 0px; padding: 6px; overflow: auto; width: 640px; height: 66px; text-align: left;" dir="ltr">$ mkdir ~/pulse-backup &amp;&amp; cp -r ~/.pulse ~/.asound* /etc/asound.conf /etc/pulse -t ~/pulse-backup/
$ rm -r ~/.pulse ~/.asound*
$ sudo rm /etc/asound.conf</pre>
<p>2. Ensure you have the necessary PulseAudio libraries and configuration utilities installed:<br />
Code:</p>
<pre class="alt2" style="border: 1px inset; margin: 0px; padding: 6px; overflow: auto; width: 640px; height: 34px; text-align: left;" dir="ltr"> $ sudo apt-get install libasound2-plugins padevchooser libsdl1.2debian-pulseaudio</pre>
<p>3. Ensure the evil &#8220;libflashsupport&#8221; library is <strong>not</strong> installed:<br />
Code:</p>
<pre class="alt2" style="border: 1px inset; margin: 0px; padding: 6px; overflow: auto; width: 640px; height: 34px; text-align: left;" dir="ltr">$ sudo apt-get remove --purge libflashsupport flashplugin-nonfree-extrasound</pre>
<p>And restart Firefox or Chromium  ^_^</p>
<p>I have tried this with my Ubuntu Karmic</p>
]]></content:encoded>
			<wfw:commentRss>http://www.mgimena.com/2010/04/19/how-to-enable-flash-audio-in-ubuntu/feed/</wfw:commentRss>
		</item>
		<item>
		<title>Installing mysql gem with MAMP already installed on Mac Os</title>
		<link>http://www.mgimena.com/2010/04/02/installing-mysql-gem-with-mamp-already-installed-on-mac-os/</link>
		<comments>http://www.mgimena.com/2010/04/02/installing-mysql-gem-with-mamp-already-installed-on-mac-os/#comments</comments>
		<pubDate>Fri, 02 Apr 2010 16:41:35 +0000</pubDate>
		<dc:creator>admin</dc:creator>
		
		<category><![CDATA[IT Related]]></category>

		<category><![CDATA[Ruby on Rails]]></category>

		<guid isPermaLink="false">http://www.mgimena.com/?p=58</guid>
		<description><![CDATA[export ARCHFLAGS=&#8221;-arch i386 -arch x86_64&#8243; ;sudo gem install &#8211;no-rdoc &#8211;no-ri -v=2.7 mysql &#8212; &#8211;with-mysql-dir=/Applications/MAMP/Library/bin/mysql &#8211;with-mysql-config=/Applications/MAMP/Library/bin/mysql_config
]]></description>
			<content:encoded><![CDATA[<p>export ARCHFLAGS=&#8221;-arch i386 -arch x86_64&#8243; ;sudo gem install &#8211;no-rdoc &#8211;no-ri -v=2.7 mysql &#8212; &#8211;with-mysql-dir=/Applications/MAMP/Library/bin/mysql &#8211;with-mysql-config=/Applications/MAMP/Library/bin/mysql_config</p>
]]></content:encoded>
			<wfw:commentRss>http://www.mgimena.com/2010/04/02/installing-mysql-gem-with-mamp-already-installed-on-mac-os/feed/</wfw:commentRss>
		</item>
		<item>
		<title>Install NetBeans on Ubuntu 8.10</title>
		<link>http://www.mgimena.com/2010/03/16/install-netbeans-on-ubuntu-810/</link>
		<comments>http://www.mgimena.com/2010/03/16/install-netbeans-on-ubuntu-810/#comments</comments>
		<pubDate>Tue, 16 Mar 2010 10:17:21 +0000</pubDate>
		<dc:creator>admin</dc:creator>
		
		<category><![CDATA[IT Related]]></category>

		<category><![CDATA[Ruby on Rails]]></category>

		<guid isPermaLink="false">http://www.mgimena.com/?p=55</guid>
		<description><![CDATA[
Setup the Source Repository

deb http://za.archive.ubuntu.com/ubuntu/ intrepid universe
deb-src http://za.archive.ubuntu.com/ubuntu/ intrepid universe
deb http://za.archive.ubuntu.com/ubuntu/ intrepid-updates universe
deb-src http://za.archive.ubuntu.com/ubuntu/ intrepid-updates universe
deb http://za.archive.ubuntu.com/ubuntu/ intrepid multiverse
deb-src http://za.archive.ubuntu.com/ubuntu/ intrepid multiverse
deb http://za.archive.ubuntu.com/ubuntu/ intrepid-updates multiverse
deb-src http://za.archive.ubuntu.com/ubuntu/ intrepid-updates multiverse


To install NetBeans via the Ubuntu Package Manager, ensure that the correct repository is listed in the source listing file. NetBeans is found inf the universe repository and [...]]]></description>
			<content:encoded><![CDATA[<ol>
<li><strong>Setup the Source Repository</strong>
<ul>
<li>deb <a href="http://za.archive.ubuntu.com/ubuntu/">http://za.archive.ubuntu.com/ubuntu/</a> intrepid universe</li>
<li>deb-src <a href="http://za.archive.ubuntu.com/ubuntu/">http://za.archive.ubuntu.com/ubuntu/</a> intrepid universe</li>
<li>deb <a href="http://za.archive.ubuntu.com/ubuntu/">http://za.archive.ubuntu.com/ubuntu/</a> intrepid-updates universe</li>
<li>deb-src <a href="http://za.archive.ubuntu.com/ubuntu/">http://za.archive.ubuntu.com/ubuntu/</a> intrepid-updates universe</li>
<li>deb <a href="http://za.archive.ubuntu.com/ubuntu/">http://za.archive.ubuntu.com/ubuntu/</a> intrepid multiverse</li>
<li>deb-src <a href="http://za.archive.ubuntu.com/ubuntu/">http://za.archive.ubuntu.com/ubuntu/</a> intrepid multiverse</li>
<li>deb <a href="http://za.archive.ubuntu.com/ubuntu/">http://za.archive.ubuntu.com/ubuntu/</a> intrepid-updates multiverse</li>
<li>deb-src <a href="http://za.archive.ubuntu.com/ubuntu/">http://za.archive.ubuntu.com/ubuntu/</a> intrepid-updates multiverse</li>
</ul>
</li>
<p>To install NetBeans via the Ubuntu Package Manager, ensure that the correct repository is listed in the source listing file. NetBeans is found inf the <em>universe</em> repository and Java is found in the <em>multiverse</em> repository.</p>
<p class="amcode">Code:</p>
<div class="codeblock amc_code amc_short">
<table border="0">
<tbody>
<tr class="amc_code_odd">
<td class="amc_line"></td>
<td><code><span class="amc_default">sudo gedit /etc/apt/sources.list</span></code></td>
</tr>
</tbody>
</table>
</div>
<p>Ensure that the following sources are added to the configuration file:</p>
<p>After the configuration file is updated, the package repository needs to updated with the following command:</p>
<p class="amcode">Code:</p>
<div class="codeblock amc_code amc_short">
<table border="0">
<tbody>
<tr class="amc_code_odd">
<td class="amc_line"></td>
<td><code><span class="amc_default">sudo apt-get update</span></code></td>
</tr>
</tbody>
</table>
</div>
<li><strong>Install Required Software</strong></li>
<p>To install Java version 6, the following command needs to be executed:</p>
<p class="amcode">Code:</p>
<div class="codeblock amc_code amc_short">
<table border="0">
<tbody>
<tr class="amc_code_odd">
<td class="amc_line"></td>
<td><code><span class="amc_default">sudo apt-get install sun-java6-jdk sun-java6-plugin</span></code></td>
</tr>
</tbody>
</table>
</div>
<li><strong>Install Netbeans IDE</strong></li>
<p>To install NetBeans, the following command needs to be executed. The package manager does not necessarily install the latest version of NetBeans. The package manager will install the latest NetBeans that is supported by Ubuntu.</p>
<p class="amcode">Code:</p>
<p class="amcode">sudo apt-get install netbeans</p>
<p class="amcode">Source : <a href="http://www.javadesign.info/SystemsHardware/OS/Ubuntu/install-netbeans-on-ubuntu">http://www.javadesign.info/SystemsHardware/OS/Ubuntu/install-netbeans-on-ubuntu</a></p>
<div class="codeblock amc_code amc_short">
<table border="0">
<tbody>
<tr class="amc_code_odd">
<td class="amc_line"></td>
<td><code><span class="amc_default">sudo apt-get install netbeans</p>
<p></span></code></td>
</tr>
</tbody>
</table>
</div>
</ol>
]]></content:encoded>
			<wfw:commentRss>http://www.mgimena.com/2010/03/16/install-netbeans-on-ubuntu-810/feed/</wfw:commentRss>
		</item>
		<item>
		<title>Installing readline for ruby - for ubuntu</title>
		<link>http://www.mgimena.com/2010/03/15/installing-readline-for-ruby-for-ubuntu/</link>
		<comments>http://www.mgimena.com/2010/03/15/installing-readline-for-ruby-for-ubuntu/#comments</comments>
		<pubDate>Mon, 15 Mar 2010 06:16:29 +0000</pubDate>
		<dc:creator>admin</dc:creator>
		
		<category><![CDATA[IT Related]]></category>

		<category><![CDATA[Ruby on Rails]]></category>

		<guid isPermaLink="false">http://www.mgimena.com/?p=52</guid>
		<description><![CDATA[apt-get install libreadline5 libreadline5-dev
apt-get install libncurses5 libncurses5-dev

cd /usr/src/ruby-1.8.6-p368/ext/readline/
ruby extconf.rb
sudo make
sudo make install

done..
]]></description>
			<content:encoded><![CDATA[<pre>apt-get install libreadline5 libreadline5-dev
apt-get install libncurses5 libncurses5-dev

cd /usr/src/ruby-1.8.6-p368/ext/readline/
ruby extconf.rb
sudo make
sudo make install

done..</pre>
]]></content:encoded>
			<wfw:commentRss>http://www.mgimena.com/2010/03/15/installing-readline-for-ruby-for-ubuntu/feed/</wfw:commentRss>
		</item>
		<item>
		<title>Configuring Syslog for Rails</title>
		<link>http://www.mgimena.com/2010/03/15/configuring-syslog-for-rails/</link>
		<comments>http://www.mgimena.com/2010/03/15/configuring-syslog-for-rails/#comments</comments>
		<pubDate>Mon, 15 Mar 2010 06:02:02 +0000</pubDate>
		<dc:creator>admin</dc:creator>
		
		<category><![CDATA[IT Related]]></category>

		<category><![CDATA[Ruby on Rails]]></category>

		<guid isPermaLink="false">http://www.mgimena.com/?p=49</guid>
		<description><![CDATA[
I was working on a Rails application recently that required the logs to be sent to remote log server. This blog is just a summary of the steps to get it working. I used Rails 2.0 and the development was done on Ubuntu.
The first thing was to get syslog-ng. Its more advanced than syslogd.
sudo apt-get [...]]]></description>
			<content:encoded><![CDATA[<div class="snap_preview">
<p>I was working on a Rails application recently that required the logs to be sent to remote log server. This blog is just a summary of the steps to get it working. I used Rails 2.0 and the development was done on Ubuntu.</p>
<p>The first thing was to get syslog-ng. Its more advanced than syslogd.</p>
<p><em><strong><code>sudo apt-get install syslog-ng</code></strong></em></p>
<p>The next step was to get the SysLogLogger tool to send the logs to syslog instead of a file. Go to the vendor directory of your application and get SysLogLogger using the following command.</p>
<p><em><strong><code>curl http://rubyforge.org/frs/download.php/20520/SyslogLogger-1.4.0.tgz<br />
-L | tar -zxvv</code></strong></em></p>
<p>Assuming that you are working in the development environment , add this to the start of the development.rb file in the configuration directory</p>
<p><em><strong><code>$:.unshift File.join(RAILS_ROOT, "vendor", "SyslogLogger-1.4.0", "lib")<br />
require 'syslog_logger'<br />
RAILS_DEFAULT_LOGGER = SyslogLogger.new(program_name = 'my-application')<br />
config.logger = RAILS_DEFAULT_LOGGER</code><br />
</strong></em></p>
<p>Locate the syslog.conf file in the etc directory and add these lines.</p>
<p><em><strong><code>!my-rails-application<br />
user.*    /var/log/development.log</code><br />
</strong></em><br />
What this does is gets the logs that are sent to syslog from the rails application and writes it to the development.log file in /var/log/ dir</p>
<p>To get the changes working, restart the syslog service on Ubuntu by running the following command<br />
<em><strong><code>sudo /etc/init.d/sysklogd restart</code></strong></em></p>
<p>To send the logs to a remote log server instead of the log file use this in the syslog.conf file instead<br />
<em><strong><code>user.* @address of remote log server</code><br />
</strong></em><br />
The log server should be configured to accept logs from remote systems. The syslogd file in the remote log server needs to be changed to show the following for this purpose</p>
<p><em><strong><code>SYSLOGD="-r"</code></strong></em></p>
<p>The syslogd file is located in the etc/default dir in Ubuntu. Since I had the log server configured already, I did not need to change the configuration. Please add comments on this post in case something is missing.</p>
<p>The log files can be rotated on a periodic basis (or depending on size) by configuring the logrotate.conf file in the etc dir.<br />
See <strong><code>man logrotate</code></strong> for details.</p>
<p>Source: <a href="http://2muchtea.wordpress.com/category/ubuntu/">http://2muchtea.wordpress.com/category/ubuntu/</a></div>
]]></content:encoded>
			<wfw:commentRss>http://www.mgimena.com/2010/03/15/configuring-syslog-for-rails/feed/</wfw:commentRss>
		</item>
		<item>
		<title>Installing Openssl on Ubuntu</title>
		<link>http://www.mgimena.com/2010/03/14/installing-openssl-on-ubuntu/</link>
		<comments>http://www.mgimena.com/2010/03/14/installing-openssl-on-ubuntu/#comments</comments>
		<pubDate>Mon, 15 Mar 2010 05:52:52 +0000</pubDate>
		<dc:creator>admin</dc:creator>
		
		<category><![CDATA[IT Related]]></category>

		<category><![CDATA[Ruby on Rails]]></category>

		<guid isPermaLink="false">http://www.mgimena.com/?p=47</guid>
		<description><![CDATA[If you have tried to install Mechanize or any gem that requires openssl on Ubuntu or Debian, you may have encountered the following error…
LoadError: no such file to load—openssl
despite the fact that you have installed openssl with “gem install libopenssl-ruby”.
Thanks to this thread, I found out that in order to install openssl, you have to [...]]]></description>
			<content:encoded><![CDATA[<p>If you have tried to install Mechanize or any gem that requires openssl on <a href="http://www.amazon.com/gp/product/067232993X?ie=UTF8&amp;tag=classroommovi-20&amp;linkCode=as2&amp;camp=1789&amp;creative=390957&amp;creativeASIN=067232993X">Ubuntu</a><img style="border: medium none  ! important; margin: 0px ! important;" src="http://www.assoc-amazon.com/e/ir?t=classroommovi-20&amp;l=as2&amp;o=1&amp;a=067232993X" border="0" alt="" width="1" height="1" /> or Debian, you may have encountered the following error…</p>
<blockquote><p>LoadError: no such file to load—openssl</p></blockquote>
<p>despite the fact that you have installed openssl with “gem install libopenssl-ruby”.</p>
<p>Thanks to <a href="http://www.ruby-forum.com/topic/90083">this thread</a>, I found out that in order to install openssl, you have to tell ruby how to compile the openssl extension, like this…</p>
<pre><code>cd /ruby-1.8.4/ext/openssl
ruby extconf.rb
make

Source: <a href="http://www.jessirae.com/blog/articles/2007/03/11/installing-openssl-on-ubuntu">http://www.jessirae.com/blog/articles/2007/03/11/installing-openssl-on-ubuntu</a>
make install</code></pre>
]]></content:encoded>
			<wfw:commentRss>http://www.mgimena.com/2010/03/14/installing-openssl-on-ubuntu/feed/</wfw:commentRss>
		</item>
		<item>
		<title>Remote Resolution of Git Conflicts</title>
		<link>http://www.mgimena.com/2010/02/18/remote-resolution-of-git-conflicts/</link>
		<comments>http://www.mgimena.com/2010/02/18/remote-resolution-of-git-conflicts/#comments</comments>
		<pubDate>Thu, 18 Feb 2010 07:54:39 +0000</pubDate>
		<dc:creator>admin</dc:creator>
		
		<category><![CDATA[IT Related]]></category>

		<category><![CDATA[Ruby on Rails]]></category>

		<guid isPermaLink="false">http://www.mgimena.com/?p=44</guid>
		<description><![CDATA[You are attempting to push when you experience a conflict:
[ksedgwic@lap2 bonsai-wiki]$ git push
To ssh://ikiwiki@git.bonsai.com/~/public_git/bonsai-wiki.git
 ! [rejected]        master -&#62; master (non-fast forward)
error: failed to push some refs to 'ssh://ikiwiki@git.bonsai.com/~/public_git/bonsai-wiki.git'
First, see if the conflict can be automatically resolved:
[ksedgwic@lap2 bonsai-wiki]$ git pull
remote: Counting objects: 9, done.
remote: Compressing objects: 100% (5/5), done.
remote: [...]]]></description>
			<content:encoded><![CDATA[<p>You are attempting to push when you experience a conflict:</p>
<pre>[ksedgwic@lap2 bonsai-wiki]$ git push
To ssh://ikiwiki@git.bonsai.com/~/public_git/bonsai-wiki.git
 ! [rejected]        master -&gt; master (non-fast forward)
error: failed to push some refs to 'ssh://ikiwiki@git.bonsai.com/~/public_git/bonsai-wiki.git'</pre>
<p>First, see if the conflict can be automatically resolved:</p>
<pre>[ksedgwic@lap2 bonsai-wiki]$ git pull
remote: Counting objects: 9, done.
remote: Compressing objects: 100% (5/5), done.
remote: Total 5 (delta 3), reused 0 (delta 0)
Unpacking objects: 100% (5/5), done.
From ssh://ikiwiki@git.bonsai.com/~/public_git/bonsai-wiki
   fe30702..b52b62c  master     -&gt; origin/master
Auto-merged howtos/vcs/git_conflict.mdwn
CONFLICT (content): Merge conflict in howtos/vcs/git_conflict.mdwn
Automatic merge failed; fix conflicts and then commit the result.</pre>
<p>Git status shows that your state is conflicted:</p>
<pre>[ksedgwic@lap2 bonsai-wiki]$ git status
howtos/vcs/git_conflict.mdwn: needs merge
# On branch master
# Your branch and 'origin/master' have diverged,
# and have 1 and 1 different commit(s) each, respectively.
#
# Changed but not updated:
#   (use "git add ..." to update what will be committed)
#
#       unmerged:   howtos/vcs/git_conflict.mdwn
#
no changes added to commit (use "git add" and/or "git commit -a")</pre>
<p><em>IMPORTANT</em> - If you can resolve the conflict do so (normal procedure), this procedure presumes you wish to write the conflicting updates to a branch.</p>
<p>Reset your tree to just your unmerged updates:</p>
<pre>[ksedgwic@lap2 vcs]$ git reset --hard HEAD
HEAD is now at e1497e3 Changed title.</pre>
<p>Create a branch, use a name which suggests a conflict:</p>
<pre>[ksedgwic@lap2 vcs]$ git branch master-conflict-20090125
[ksedgwic@lap2 vcs]$ git branch
* master
  master-conflict-20090125</pre>
<p>Reset your tree to the prior revision:</p>
<pre>[ksedgwic@lap2 vcs]$ git reset --hard HEAD^
HEAD is now at fe30702 started test for creating dual headed branches upon push</pre>
<p>Pull the other persons changes:</p>
<pre>[ksedgwic@lap2 vcs]$ git pull</pre>
<p>Switch back to your branch:</p>
<pre>[ksedgwic@lap2 vcs]$ git checkout master-conflict-20090125
Switched to branch "master-conflict-20090125"</pre>
<p>Push your conflict branch back to the repoistory:</p>
<pre>[ksedgwic@lap2 vcs]$ git push origin master-conflict-20090125
Counting objects: 9, done.
Compressing objects: 100% (5/5), done.
Writing objects: 100% (5/5), 406 bytes, done.
Total 5 (delta 3), reused 0 (delta 0)
To ssh://ikiwiki@git.bonsai.com/~/public_git/bonsai-wiki.git
 * [new branch]      master-conflict-20090125 -&gt; master-conflict-20090125
remote: Counting objects: 9, done.
remote: Compressing objects: 100% (5/5), done.
remote: Total 5 (delta 3), reused 0 (delta 0)
From /home/ikiwiki/public_git/bonsai-wiki
 * [new branch]      master-conflict-20090125 -&gt; origin/master-conflict-20090125</pre>
<p>complete reference : <a href="http://www.bonsai.com/wiki/howtos/vcs/git_remote_resolve/" target="_blank">http://www.bonsai.com/wiki/howtos/vcs/git_remote_resolve/</a></p>
]]></content:encoded>
			<wfw:commentRss>http://www.mgimena.com/2010/02/18/remote-resolution-of-git-conflicts/feed/</wfw:commentRss>
		</item>
		<item>
		<title>Ruby on Rails simple tutorials</title>
		<link>http://www.mgimena.com/2010/02/09/ruby-on-rails-simple-tutorials/</link>
		<comments>http://www.mgimena.com/2010/02/09/ruby-on-rails-simple-tutorials/#comments</comments>
		<pubDate>Tue, 09 Feb 2010 08:10:10 +0000</pubDate>
		<dc:creator>admin</dc:creator>
		
		<category><![CDATA[IT Related]]></category>

		<category><![CDATA[Ruby on Rails]]></category>

		<guid isPermaLink="false">http://www.mgimena.com/?p=41</guid>
		<description><![CDATA[http://www.tutorialspoint.com/ruby-on-rails/index.htm
]]></description>
			<content:encoded><![CDATA[<p><a href="http://www.tutorialspoint.com/ruby-on-rails/index.htm" target="_blank">http://www.tutorialspoint.com/ruby-on-rails/index.htm</a></p>
]]></content:encoded>
			<wfw:commentRss>http://www.mgimena.com/2010/02/09/ruby-on-rails-simple-tutorials/feed/</wfw:commentRss>
		</item>
		<item>
		<title>Dave Matthews Band</title>
		<link>http://www.mgimena.com/2010/02/09/dave-matthews-band/</link>
		<comments>http://www.mgimena.com/2010/02/09/dave-matthews-band/#comments</comments>
		<pubDate>Tue, 09 Feb 2010 06:28:31 +0000</pubDate>
		<dc:creator>admin</dc:creator>
		
		<category><![CDATA[Music]]></category>

		<guid isPermaLink="false">http://www.mgimena.com/?p=38</guid>
		<description><![CDATA[http://216.178.38.116/index.cfm?fuseaction=music.artistalbums&#38;artistid=5890852&#38;albumid=14916961
]]></description>
			<content:encoded><![CDATA[<p><a href="http://216.178.38.116/index.cfm?fuseaction=music.artistalbums&amp;artistid=5890852&amp;albumid=14916961" target="_blank">http://216.178.38.116/index.cfm?fuseaction=music.artistalbums&amp;artistid=5890852&amp;albumid=14916961</a></p>
]]></content:encoded>
			<wfw:commentRss>http://www.mgimena.com/2010/02/09/dave-matthews-band/feed/</wfw:commentRss>
		</item>
	</channel>
</rss>
