git meta cherry-pick silently overwrites untracked files which become tracked

[novalis]

If the incoming commit's submodule 's' contains a file 'x' , but 'x' already exists as an untracked file inside 'x', it will be silently overwritten with the version from the incoming commit, potentially losing data.