On Wednesday 15 of August 2012 23:05:36 David C. Rankin wrote: > I think I fixed it: > > vi src/CMakeLists.txt > git add src/CMakeLists.txt > git add admin > git add cmake > git pull > You have not concluded your merge (MERGE_HEAD exists). > Please, commit your changes before you can merge. > git commit -a > git pull > Already up-to-date. > > I hope this didn't screw anything else up. But at least git pull works! With git log origin/HEAD..HEAD you can check whether you really on remote branch. Slavek --