Comments on: Git Error: trailing whitespace, indent SP followed by a TAB, unresolved merge conflict /2008/04/23/git-error-trailing-whitespace-indent-sp-followed-by-a-tab-unresolved-merge-conflict/ Its all about Ruby On Rails Thu, 14 Mar 2013 06:19:42 +0000 hourly 1 #/?v= By: grosser /2008/04/23/git-error-trailing-whitespace-indent-sp-followed-by-a-tab-unresolved-merge-conflict/comment-page-1/#comment-1039 grosser Wed, 25 Mar 2009 09:53:45 +0000 /2008/04/23/git-error-trailing-whitespace-indent-sp-followed-by-a-tab-unresolved-merge-conflict/#comment-1039 my problem is that i use markdown on many projects and would like to disable this filter globally, but this helps for now... my problem is that i use markdown on many projects and would like to disable this filter globally, but this helps for now…

]]> By: Felipe Giotto /2008/04/23/git-error-trailing-whitespace-indent-sp-followed-by-a-tab-unresolved-merge-conflict/comment-page-1/#comment-721 Felipe Giotto Tue, 14 Oct 2008 10:52:19 +0000 /2008/04/23/git-error-trailing-whitespace-indent-sp-followed-by-a-tab-unresolved-merge-conflict/#comment-721 Great tip! I had the trailing whitespace problem because of some Markdown titles (with a lot of = under the text).... Now my commits are working fine! Thanks! Great tip! I had the trailing whitespace problem because of some Markdown titles (with a lot of = under the text)…. Now my commits are working fine!

Thanks!

]]> By: Nate Clark /2008/04/23/git-error-trailing-whitespace-indent-sp-followed-by-a-tab-unresolved-merge-conflict/comment-page-1/#comment-719 Nate Clark Mon, 14 Jul 2008 15:56:26 +0000 /2008/04/23/git-error-trailing-whitespace-indent-sp-followed-by-a-tab-unresolved-merge-conflict/#comment-719 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.

]]> By: Jesper Rønn-Jensen /2008/04/23/git-error-trailing-whitespace-indent-sp-followed-by-a-tab-unresolved-merge-conflict/comment-page-1/#comment-718 Jesper Rønn-Jensen Tue, 27 May 2008 19:28:39 +0000 /2008/04/23/git-error-trailing-whitespace-indent-sp-followed-by-a-tab-unresolved-merge-conflict/#comment-718 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.

]]> By: Evgeny /2008/04/23/git-error-trailing-whitespace-indent-sp-followed-by-a-tab-unresolved-merge-conflict/comment-page-1/#comment-716 Evgeny Thu, 24 Apr 2008 14:53:29 +0000 /2008/04/23/git-error-trailing-whitespace-indent-sp-followed-by-a-tab-unresolved-merge-conflict/#comment-716 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?

]]> By: Chris /2008/04/23/git-error-trailing-whitespace-indent-sp-followed-by-a-tab-unresolved-merge-conflict/comment-page-1/#comment-717 Chris Wed, 23 Apr 2008 22:33:54 +0000 /2008/04/23/git-error-trailing-whitespace-indent-sp-followed-by-a-tab-unresolved-merge-conflict/#comment-717 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.

]]>