<html>
<head>
<meta content="text/html; charset=ISO-8859-1"
http-equiv="Content-Type">
</head>
<body text="#000000" bgcolor="#FFFFFF">
<div class="moz-cite-prefix">On 08/22/2013 05:06 PM, Johannes Pfau
wrote:<br>
</div>
<br>
I'm getting wired auto-tester erros<br>
<br>
<meta http-equiv="content-type" content="text/html;
charset=ISO-8859-1">
<pre style="color: rgb(0, 0, 0); font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;">setting up remote topull -> <a class="moz-txt-link-freetext" href="https://github.com/burner/phobos.git">https://github.com/burner/phobos.git</a>
fetching contents of <a class="moz-txt-link-freetext" href="https://github.com/burner/phobos.git">https://github.com/burner/phobos.git</a>
>From <a class="moz-txt-link-freetext" href="https://github.com/burner/phobos">https://github.com/burner/phobos</a>
* [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</pre>
<br>
from the error message I would say somebody did modify the win64.mak
on the test machine without committing it?<br>
</body>
</html>