Clonemachine currently supports marking files as removed, so they don't show up as conflicts anymore if they have been changed upstream. This doesn't work for directories such as src/qt or doc/release-notes. Clonemachine should support removed directories as well.