12 Dec
2010
12 Dec
'10
11 a.m.
Yep, seems that pulled in the conflicting branches:
dark-castle:pike79 $ git config --global core.ignorecase true dark-castle:pike79 $ git pull From pike-git.lysator.liu.se:pike + 108b128...5c8e890 branches/hubbe -> origin/branches/hubbe (forced update) + 4cff4c1...68b88f5 branches/infovav -> origin/branches/infovav (forced update) Current branch 7.9 is up to date.