d-p-l.org statement.html

[Jonathan M Davis]

On Wednesday 13 July 2011 21:49:00  wrote:
> http://www.d-programming-language.org/statement.html
> 
> Scroll down to the bottom. Looks like someone committed a file that had
> merge markup in it. I'm not even sure how git would let you do this.

Easily. When it gives you a merge conflict, you just commit the file generated 
from the merge without dealing with the conflicts - or you do try and deal with 
the conflicts but you miss one. That sort of thing is caught very easily with 
code, because it's not going to compile with all of those >>>>>>>>>> and 
<<<<<<< in the file. ddoc, on the other hand, can legally contain >>>>>>> and 
<<<<<<<, so the documentation compiled just fine. No one caught it, and it 
ended up in the master repository.

-  Jonathan M Davis