http://databasically.com/2010/07/01/git-pull-is-not-possible-because-you-have-unmerged-files/ Kansas City Small Business IT Fri, 16 Dec 2011 05:01:12 +0000 hourly 1 http://wordpress.org/?v=3.2.1 http://databasically.com/2010/07/01/git-pull-is-not-possible-because-you-have-unmerged-files/comment-page-1/#comment-171 Fabian Fri, 14 Oct 2011 16:04:30 +0000 http://databasically.com/?p=337#comment-171 “Merge not possible – you have unmerged files” I'm getting this exact error message right now, and it stinks! If I Ctrl+M the file in question, I get told that "Both file contents are equal". What is going on...? My problem concerns the .gitignore file, should it be versioned at all? “Merge not possible – you have unmerged files”
I’m getting this exact error message right now, and it stinks!
If I Ctrl+M the file in question, I get told that “Both file contents are equal”.
What is going on…?
My problem concerns the .gitignore file, should it be versioned at all?

]]> http://databasically.com/2010/07/01/git-pull-is-not-possible-because-you-have-unmerged-files/comment-page-1/#comment-170 Jean Doyon Wed, 05 Oct 2011 01:49:17 +0000 http://databasically.com/?p=337#comment-170 Thanks! Thanks!

]]> http://databasically.com/2010/07/01/git-pull-is-not-possible-because-you-have-unmerged-files/comment-page-1/#comment-61 Andrew Heins Fri, 10 Sep 2010 14:10:20 +0000 http://databasically.com/?p=337#comment-61 Thanks for this. I was wondering what was going on. "Merge not possible - you have unmerged files" is a bit confusing. Thanks for this. I was wondering what was going on. “Merge not possible – you have unmerged files” is a bit confusing.

]]>