|
841.
|
|
|
Failed to merge submodule %s (commits not present)
|
|
|
|
Falló al fusionar el submódulo %s (commits no presentes)
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
merge-recursive.c:1206
|
|
842.
|
|
|
Failed to merge submodule %s (commits don't follow merge-base)
|
|
|
|
Falló el fusionar submódulo %s (commits no siguen la fusión base)
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
merge-recursive.c:1213
|
|
843.
|
|
|
Fast-forwarding submodule %s to the following commit:
|
|
|
|
Haciendo fast-forward a submódulo %s para el siguiente commit:
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
merge-recursive.c:1221 merge-recursive.c:1233
|
|
844.
|
|
|
Fast-forwarding submodule %s
|
|
|
|
Avance rápido en submódulo %s
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
merge-recursive.c:1224 merge-recursive.c:1236
|
|
845.
|
|
|
Failed to merge submodule %s (merge following commits not found)
|
|
|
|
Falló al fusionar submódulo %s (los siguentes commits no fueron encontrados)
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
merge-recursive.c:1259
|
|
846.
|
|
|
Failed to merge submodule %s (not fast-forward)
|
|
|
|
Falló al fusionar el submódulo %s (no es posible avance rápido)
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
merge-recursive.c:1263
|
|
847.
|
|
|
Found a possible merge resolution for the submodule:
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
Se encontró una posible solución de fusión para el submódulo:
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
merge-recursive.c:1264
|
|
848.
|
|
|
If this is correct simply add it to the index for example
by using:
git update-index --cacheinfo 160000 %s " %s "
which will accept this suggestion.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
Si esto es correcto simplemente agrégalo al índice por ejemplo
usando:
git update-index --cacheinfo 160000 %s " %s "
el cual aceptará esta sugerencia.
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
merge-recursive.c:1267
|
|
849.
|
|
|
Failed to merge submodule %s (multiple merges found)
|
|
|
|
Falló al fusionar el submódulo %s (fusiones múltiples encontradas)
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
merge-recursive.c:1276
|
|
850.
|
|
|
Failed to execute internal merge
|
|
|
|
Falló al ejecutar la fusión interna
|
|
Translated by
Christopher-diaz-riv
|
|
|
|
Located in
merge-recursive.c:1349
|