I also do this, it's a great workflow I think.

There are occasionally conflicts, but I've never actually gotten a corrupted repository. All I ever do is go with the latest version of things using 'find' to delete the conflicts.