[Wine] Regression testing Money 2004

Peter Beutner p.beutner at gmx.net
Sat Jun 17 11:31:23 CDT 2006


Tony Pursell schrieb:
 > and repeated the same compile for the last three runs.  There is an
> error message after 'git bisect good':
> 
> fatal: Entry 'tools/winewrapper' not uptodate. Cannot merge.
> 
> Does this have something to do with it?
Well, fatal errors usually have something to mean ;). 

It means that there are uncommited changes in tools/winewrapper and 
git bisect can't update your tree.

I think you could undo any local changes by running
git checkout -f HEAD

and then running 'git bisect good' again.
Hope that helps.




More information about the wine-users mailing list