Don't generate conflicts when checking out a modified submodule and the
submodule is dirty or modified in the workdir.