On Friday, January 3, 2014 6:27:21 PM UTC+2, Philip Oakley wrote: > > "First, don't panic. Nothing is lost. > > It sound like the 'pull' workflow you are using, does *not* match the > work style of the upstream project." > Having removed the topic, I only have one branch - master. Somehow, the problem file is the version from the topic, not the version in master at Gitorious. Using Windows 7, mysysgit 1.81. My path includes C:\PROGS\Programming\Git\cmd where gitk.cmd is. If I run gitk I get an error message - see attachment. But gitk should be irrelevant as I only have one branch - master. It is just that somehow I need to get git happy with the correct version of this file.
<<attachment: Gitk error.png>>