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

Installing subversion from pre-compiled packages or source code

Published on

What is subversion(svn): Subversion is an open source version control system used for keep track of change to source code. Subversion manages files and directories over time an increments revision made to the file system. A tree of file is placed into a central repository. The repository is much like an ordinary file server, except … Continue reading Installing subversion from pre-compiled packages or source code