[Spice-devel] Error while updating spice-gtk

[Yaniv Kaul]

Updating 836a18d..4b39f32
error: The following untracked working tree files would be overwritten 
by merge:
     doc/reference/spice-gtk-overrides.txt
Please move or remove them before you can merge.


Anything i'm doing wrong?
Y.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/spice-devel/attachments/20120830/b015696e/attachment.html>