echa un vistazo a todos los files en conflicto en otra twig a través de bash en git

Tengo un conflicto de files que no se han resuelto por un time. Traté de usar el siguiente command:

git checkout MOODLE_31_STABLE $(grep -rwl "<<<<<<< HEAD") 

que intenta verificar cada file en conflicto y lo reemplazó por copyr MOODLE_31_STABLE.

desafortunadamente, para algunos files recibo este error:

 error: pathspec 'theme/boost/config.php' did not match any file(s) known to git. error: pathspec 'theme/boost/lang/en/theme_boost.php' did not match any file(s) known to git. error: pathspec 'theme/boost/readme_moodle.txt' did not match any file(s) known to git. error: pathspec 'theme/boost/scss/bootstrap/bootstrap.scss' did not match any file(s) known to git. error: pathspec 'theme/boost/scss/bootstrap/mixins/_forms.scss' did not match any file(s) known to git. error: pathspec 'theme/boost/scss/bootstrap/mixins/_grid-framework.scss' did not match any file(s) known to git. error: pathspec 'theme/boost/scss/bootstrap/mixins/_grid.scss' did not match any file(s) known to git. error: pathspec 'theme/boost/scss/bootstrap/mixins/_text-emphasis.scss' did not match any file(s) known to git. error: pathspec 'theme/boost/scss/bootstrap/utilities/_background.scss' did not match any file(s) known to git. error: pathspec 'theme/boost/scss/bootstrap/utilities/_visibility.scss' did not match any file(s) known to git. error: pathspec 'theme/boost/scss/bootstrap/_alert.scss' did not match any file(s) known to git. error: pathspec 'theme/boost/scss/bootstrap/_card.scss' did not match any file(s) known to git. error: pathspec 'theme/boost/scss/bootstrap/_input-group.scss' did not match any file(s) known to git. error: pathspec 'theme/boost/scss/bootstrap/_media.scss' did not match any file(s) known to git. error: pathspec 'theme/boost/scss/bootstrap/_navbar.scss' did not match any file(s) known to git. error: pathspec 'theme/boost/scss/bootstrap/_print.scss' did not match any file(s) known to git. error: pathspec 'theme/boost/scss/bootstrap/_progress.scss' did not match any file(s) known to git. error: pathspec 'theme/boost/scss/bootstrap/_reboot.scss' did not match any file(s) known to git. error: pathspec 'theme/boost/scss/bootstrap/_tables.scss' did not match any file(s) known to git. error: pathspec 'theme/boost/scss/bootstrap/_variables.scss' did not match any file(s) known to git. error: pathspec 'theme/boost/scss/moodle/course.scss' did not match any file(s) known to git. error: pathspec 'theme/boost/scss/preset-default.scss' did not match any file(s) known to git. error: pathspec 'theme/boost/settings.php' did not match any file(s) known to git. error: pathspec 'theme/boost/templates/core/dataformat_selector.mustache' did not match any file(s) known to git. error: pathspec 'theme/boost/templates/mod_assign/grading_navigation.mustache' did not match any file(s) known to git. error: pathspec 'theme/boost/thirdpartylibs.xml' did not match any file(s) known to git. 

Lo he verificado y la twig se ha revisado, por lo que está en local. los files existen en ambas twigs … Así que realmente no entiendo por qué obtengo los errores.

Si tiene un file en conflicto y está seguro de que desea replacelo con una versión de otra twig, puede usar esta syntax:

 git checkout other_branch -- path/to/some/file.ext ^^^ name of branch ^^^ path of file 

Después de esto, aún tendrá que marcar el file como resuelto y completar la fusión. Puede repetir lo anterior para todos los files que necesite. Si está haciendo esto para una cantidad masiva de files, entonces diría que su flujo de trabajo de Git puede tener un olor, y es posible que desee reconsiderar su cambio.