Browsing Spanish translation

480 of 2380 results
480.
Merge will do its best to combine the changes in two branches, but there
are some kinds of problems only a human can fix. When it encounters those,
it will mark a conflict. A conflict means that you need to fix something,
before you can commit.
There are line breaks here. Each one represents a line break. Start a new line in the equivalent position in the translation.
Merge (fusionar) hará lo mejor posible para combinar los cambios en dos ramas, pero
hay algunos problemas que sólo un humano puede arreglar. Cuando los encuentre,
se marcará como un conflicto. Un conflicto significa que necesitas arreglar algo
antes de que puedas hacer un «commit».
Translated and reviewed by Paco Molinero
Located in bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
480 of 2380 results

This translation is managed by Ubuntu Spanish Translators, assigned by Ubuntu Translators.

You are not logged in. Please log in to work on translations.