[luos]

So if I get this then he just added the files to master, then tried to work on the topic branch?

That really seems weird. I don't think it's git's fault. Also he could have done git merge master --accept-theirs if he really wanted some kind of history but I guess it would be worthless.