Немного намутил с сабмодулем и получил следующую ошибку
error: 'modules/xyz' does not have a commit checked out
fatal: updating files failed
Для решения запускаем утилиту git mergetool
git mergetool
This message is displayed because 'merge.tool' is not configured.
See 'git mergetool --tool-help' or 'git help config' for more details.
'git mergetool' will now attempt to use one of the following tools:
meld opendiff kdiff3 tkdiff xxdiff tortoisemerge gvimdiff diffuse diffmerge ecmerge p4merge araxis bc codecompare smerge emerge vimdiff
Merging:
modules/xyz
Submodule merge conflict for 'modules/xyz':
{local}: submodule commit 276beccead5462d11cfd4569abee94
{remote}: deleted
Use (l)ocal or (r)emote, or (a)bort? r
Be First to Comment