If there are submodule changes in the file list when resolving conflicts while rebasi...