<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
</head>
<body bgcolor="#FFFFFF" text="#000000">
Updating 836a18d..4b39f32<br>
error: The following untracked working tree files would be
overwritten by merge:<br>
doc/reference/spice-gtk-overrides.txt<br>
Please move or remove them before you can merge.<br>
<br>
<br>
Anything i'm doing wrong?<br>
Y.<br>
<meta http-equiv="content-type" content="text/html;
charset=ISO-8859-1">
</body>
</html>