Vinsol - Leading Ruby on Rails Development and Consulting Firm in India » SCM http://vinsol.com/blog Wed, 11 Jan 2012 06:07:52 +0000 http://wordpress.org/?v=2.9.2 en hourly 1 Git Error: trailing whitespace, indent SP followed by a TAB, unresolved merge conflict http://vinsol.com/blog/2008/04/23/git-error-trailing-whitespace-indent-sp-followed-by-a-tab-unresolved-merge-conflict/?utm_source=rss&utm_medium=rss&utm_campaign=git-error-trailing-whitespace-indent-sp-followed-by-a-tab-unresolved-merge-conflict http://vinsol.com/blog/2008/04/23/git-error-trailing-whitespace-indent-sp-followed-by-a-tab-unresolved-merge-conflict/#comments Wed, 23 Apr 2008 18:19:34 +0000 Akhil Bansal http://webonrails.com/2008/04/23/git-error-trailing-whitespace-indent-sp-followed-by-a-tab-unresolved-merge-conflict/ Yet Another Related Posts Plugin.]]> I have been using Git from last few days, and faced following errors while committing:

1) Trailing whitespace
2) Indent SP followed by a TAB
3) Unresolved merge conflict

The first error “Trailing whitespace” is because of carriage-return/line-feed(windows style line feed/end). To resolve this problem comment following lines(58-60) in .git/hooks/pre-commit file:

The second one “Indent SP followed by a TAB” is because of leading spaces/tabs. To resolve this problem comment following lines(61-63) in .git/hooks/pre-commit file:

The third one “Unresolved merge conflict” is because of seven or more successive occurrence of = or < or > characters. Major chances of having seven = character in README or doc files. To resolve this problem replace following line(64) in .git/hooks/pre-commit file:

by

These tricks worked for me, I hope it could help you.

]]> http://vinsol.com/blog/2008/04/23/git-error-trailing-whitespace-indent-sp-followed-by-a-tab-unresolved-merge-conflict/feed/ 0 Git – Fast Version Control System http://vinsol.com/blog/2008/02/14/git-fast-version-control-system/?utm_source=rss&utm_medium=rss&utm_campaign=git-fast-version-control-system http://vinsol.com/blog/2008/02/14/git-fast-version-control-system/#comments Thu, 14 Feb 2008 19:11:01 +0000 Administrator http://webonrails.com/2008/02/15/git-fast-version-control-system/ Yet Another Related Posts Plugin.]]> Git is getting popular in Rails community these days, as there were being many changes in rails to support Git.
Git is a open sourse fast version controller system. It was originally designed by Linus Torvalds to handle large projects. It was inspired by Monotone & BitKeeper. It is a distributed version controlling system. It gives you ability to commit, traverse into history while being offline. Actually every working copy of Git is a full-fledged repository. It has no central server like SVN. One can share his working-copy/repository by using various protocols like ssh, http, ftp etc. One thing I like about Git over SVN is that the size of Git’s repository, which is smaller compared to SVN.

I gave an introductory presentation in VinSol. I am sharing it with you, this is not very explanatory as I focused on speech more. Please share your views.VinSol

]]> http://vinsol.com/blog/2008/02/14/git-fast-version-control-system/feed/ 1