On 08/22/2013 05:06 PM, Johannes Pfau
wrote:
I'm getting wired auto-tester erros
setting up remote topull -> https://github.com/burner/phobos.git
fetching contents of https://github.com/burner/phobos.git
>From https://github.com/burner/phobos
* [new branch] 10472 -> topull/10472
* [new branch] 2.061 -> topull/2.061
* [new branch] bigintpure -> topull/bigintpure
* [new branch] candidate -> topull/candidate
* [new branch] convpure -> topull/convpure
* [new branch] deque -> topull/deque
* [new branch] devel -> topull/devel
* [new branch] gh-pages -> topull/gh-pages
* [new branch] indexOfIdx -> topull/indexOfIdx
* [new branch] lastIndexOf -> topull/lastIndexOf
* [new branch] logger -> topull/logger
* [new branch] master -> topull/master
* [new branch] phobos-1.x -> topull/phobos-1.x
* [new branch] staging -> topull/staging
* [new branch] website -> topull/website
merging topull/logger
error: Your local changes to the following files would be overwritten by merge:
win64.mak
Please, commit your changes or stash them before you can merge.
Aborting
Updating e723325..621af63
from the error message I would say somebody did modify the win64.mak
on the test machine without committing it?