On 21/04/16 16:56, Pavel Sanda wrote:
bruce muirhead wrote:
bruce@debian:~/lyx$ git bisect good
Bisecting: 755 revisions left to test after this (roughly 10 steps)
error: Your local changes to the following files would be overwritten by
checkout:
        po/ar.gmo
...
        po/zh_TW.po
Please, commit your changes or stash them before you can switch branches.
Aborting

A hard reset returns me to the already tested hash, and so achieves
nothing. And a bisect reset returns me to 2.1.0.

git checkout -f should help.
Pavel

Thanks Pavel. Scott updated his instructions, and I have been following them thoroughly, and the process is now taking place... at it's own pace.

Cheers

Bruce

Reply via email to