I had the same problem after making a few changes to my site, now every time I make a change I delete all the files off the server before I upload, solves the problem.

Kash