http://webonrails.com/2008/04/23/git-error-trailing-whitespace-indent-sp-followed-by-a-tab-unresolved-merge-conflict/ Exploring RubyOnRails Thu, 21 Aug 2008 17:52:24 +0000 http://wordpress.org/?v=2.0.5 http://webonrails.com/2008/04/23/git-error-trailing-whitespace-indent-sp-followed-by-a-tab-unresolved-merge-conflict/#comment-23782 Mon, 14 Jul 2008 15:56:26 +0000 http://webonrails.com/2008/04/23/git-error-trailing-whitespace-indent-sp-followed-by-a-tab-unresolved-merge-conflict/#comment-23782 This doesn't "resolve" the problem ... you are just ignoring it. To really fix the problem, remove the whitespaces and tabs used as spaces as you should ... and git won't complain. This doesn’t “resolve” the problem … you are just ignoring it. To really fix the problem, remove the whitespaces and tabs used as spaces as you should … and git won’t complain.

]]> http://webonrails.com/2008/04/23/git-error-trailing-whitespace-indent-sp-followed-by-a-tab-unresolved-merge-conflict/#comment-20991 Tue, 27 May 2008 19:28:39 +0000 http://webonrails.com/2008/04/23/git-error-trailing-whitespace-indent-sp-followed-by-a-tab-unresolved-merge-conflict/#comment-20991 Thanks a lot for posting. The whitespace error has been teasing me, but it's still very annoying that it thinks that windows newlines are whitespace. Thanks a lot for posting. The whitespace error has been teasing me, but it’s still very annoying that it thinks that windows newlines are whitespace.

]]> http://webonrails.com/2008/04/23/git-error-trailing-whitespace-indent-sp-followed-by-a-tab-unresolved-merge-conflict/#comment-19828 Thu, 24 Apr 2008 14:53:29 +0000 http://webonrails.com/2008/04/23/git-error-trailing-whitespace-indent-sp-followed-by-a-tab-unresolved-merge-conflict/#comment-19828 I thought git was "good", as in "high quality". Why should anyone need to get dirty with git guts in this manner? I thought git was “good”, as in “high quality”. Why should anyone need to get dirty with git guts in this manner?

]]> http://webonrails.com/2008/04/23/git-error-trailing-whitespace-indent-sp-followed-by-a-tab-unresolved-merge-conflict/#comment-19798 Wed, 23 Apr 2008 22:33:54 +0000 http://webonrails.com/2008/04/23/git-error-trailing-whitespace-indent-sp-followed-by-a-tab-unresolved-merge-conflict/#comment-19798 You can also just disable the commit by removing pre-commit. The hooks run by default on Windows because it has no +x bit. Removing them does no harm. You can also just disable the commit by removing pre-commit. The hooks run by default on Windows because it has no +x bit. Removing them does no harm.

]]>