When removing a file or directory, check if it has git versioned stuff. In that case ask Git to remove it, otherwise trash it.