Archive for the 'VCS' Category

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:

if (/\s$/) {
bad_line(”trailing […]

Wednesday, April 23rd, 2008 | No Comments Posted in rails, RubyonRails, Tools, Git, VCS, SCM, pre-commit | by Akhil Bansal

I have been using “Annotate Models” rails plugin written by Dave Thomas since I found it around one and half year ago. It really helps while writing fixtures. But if you use RSpec you might miss schema info at the top of your rspec fixture file as I do. So, today I modify the plugin […]

Wednesday, April 23rd, 2008 | No Comments Posted in rails, ruby, RubyonRails, subversion, rails plugins, Tools, Git, VCS, svn, annotate_models, patch | by Akhil Bansal

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 […]

Thursday, February 14th, 2008 | 1 Comment Posted in rails, Technology, subversion, Tools, Git, VCS, svn, SCM | by Administrator