[Spice-devel] Error while updating spice-gtk

[Marc-André Lureau]

----- Mensaje original -----
> 
> 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.

Clean your repository, or just remove that file from your working tree.

(the file has been recently added by gtk-doc, and doesn't end up in .gitignore, which makes the state dirty. In theory this file is hand-written, so should be checked in)