tinderbox xclock checkout failure

[Florian Mickler]

Hi,
the xclock build fails currently with a checkout failure[1]:

git checkout origin/master
fatal: Untracked working tree file 'INSTALL' would be overwritten by
merge.


i don't know what  git commands the tinderbox-script uses, but maybe
one of : 
a) git clean -dqfx
b) git checkout --force 

could help here...


cheers,
Flo


[1]http://tinderbox.freedesktop.org/builds/2009-11-13-0030/logs/xclock/#checkout