Comment 14 for bug 818318

I got a problem that maybe could be related to the fact that git is not tracking directories. A collaborator added 2 files in a new directory. When I did a merge [2] I got the files but they were then somehow "unreferenced" and so disappeared from the repository — my colleague needed to re-add them [3]. No deletion can be seen in the commit log.

[1] https://github.com/agarwal/ocamlweb/commit/e0f262034dbd2a1c194d65166df2887ca06a2043
[2] https://github.com/agarwal/ocamlweb/commit/cb436a86c21023d52a5b10e10e5a828beb35bbfb
[3] https://github.com/agarwal/ocamlweb/commit/8591b20395b0a71f59c1c439ac7863221e7a9aa3