ubmodule (%s), and either merge commit %s
   or update to an existing commit which has merged those changes