Looks like it's the virus scan. I had this e-mail that I accidentally sent to
Michael directly instead of the list:
I will see if I can build a script that reproduces the issue we are seeing.
We are starting to speculate about what is going on now. Maybe our virus
scan is causing some git operation to fail in the middle of the merge.
The "terrible state" is a half-way applied merge.
--
View this message in context: http://git.661346.n2.nabble.com/GIT-pull-tp7459655p7460163.html
Sent from the git mailing list archive at Nabble.com.