This post originated from an RSS feed registered with Ruby Buzz by Daniel Berger. Original Post: A Typical Day with Git Feed Title: Testing 1,2,3... Feed URL: http://djberg96.livejournal.com/data/rss Feed Description: A blog on Ruby and other stuff. Latest Ruby Buzz Posts Latest Ruby Buzz Posts by Daniel Berger Latest Posts From Testing 1,2,3...

~/Repositories/io-extra>git pull
remote: Counting objects: 55, done.
remote: Compressing objects: 100% (31/31), done.
remote: Total 34 (delta 18), reused 0 (delta 0)
Unpacking objects: 100% (34/34), done.
From github.com:djberg96/io-extra
   7edde40..1fcfadc  master     -> origin/master
From github.com:djberg96/io-extra
 * [new tag]         io-extra-1.2.2 -> io-extra-1.2.2
Auto-merging test/test_io_extra.rb
CONFLICT (content): Merge conflict in test/test_io_extra.rb
Automatic merge failed; fix conflicts and then commit the result.

~/Repositories/io-extra>git co test/test_io_extra.rb 
error: path 'test/test_io_extra.rb' is unmerged

~/Repositories/io-extra>rm test/test_io_extra.rb 
~/Repositories/io-extra>git pull
You are in the middle of a conflicted merge.

~/Repositories/io-extra>git rm test/test_io_extra.rb
test/test_io_extra.rb: needs merge
rm 'test/test_io_extra.rb'

~/Repositories/io-extra>cd ..
~/Repositories>rm -rf io-extra/
~/Repositories>git clone git@github.com:djberg96/io-extra.git