Git Error: trailing whitespace, indent SP followed by a TAB, unresolved merge conflict

Published on

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 … Continue reading Git Error: trailing whitespace, indent SP followed by a TAB, unresolved merge conflict

Ruby script for creating new rails project and initial SVN import (with ignoring/removing log/other files)

Published on

Some days go I wrote a bash script for creating new rails project and initial SVN import (with ignoring/removing log/other files). And I received many comments if I could write a ruby script for this stuff. Hence here is the ruby script for creating new rails project and initial SVN import (with ignoring/removing log/other files). … Continue reading Ruby script for creating new rails project and initial SVN import (with ignoring/removing log/other files)