Archive for the 'SCM' Category

Apr 14 2010

fatal: git checkout: updating paths is incompatible with switching branches.

Published by under GIT

Using GIT I tried to pull down a new remote branch using: git checkout –track -b my-branch-name origin/my-branch-name When I did this I got this error message: fatal: git checkout: updating paths is incompatible with switching branches. Did you intend to checkout ‘origin/my-branch-name’ which can not be resolved as commit? This error message was a […]

3 responses so far

Feb 04 2010

GIT Fatal You Have not Concluded Your Merge MERGE_HEAD Exists

Published by under GIT

fatal: You have not concluded your merge. (MERGE_HEAD exists) I got this message because when I performed a “git pull”. I searched for a solution for this problem on the Internet and it wasn’t until I found this post that I was able to resolve this issue. The problem was that I: Performed a “git […]

11 responses so far

Aug 24 2009

svn: Inconsistent line ending style when trying to commit a binary file

Published by under SCM,Subversion / SVN

If you get this error message “svn: Inconsistent line ending style” when trying to commit a binary file into your SVN repository then Subversion probably thinks that your file is a text file. First verify your file with: svn proplist <your-file> If the result contains svn:eol-style but you know that your file is a binary […]

One response so far