|
482.
|
|
|
If there is no default branch set, the first merge will set it (use ![](/@@/translation-newline)
--no-remember to avoid setting it). After that, you can omit the branch ![](/@@/translation-newline)
to use the default. To change the default, use --remember. The value will ![](/@@/translation-newline)
only be saved if the remote location can be accessed.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
In Ubuntu: |
|
Si no hay ubicación predeterminada establecida, la primera vez que se combine ![](/@@/translation-newline)
se establecerá (use --no-remember para evitarlo). Después puede omitir la ![](/@@/translation-newline)
ubicación para usar la predeterminada. Para cambiarla, use --remember. El ![](/@@/translation-newline)
valor solo se guardará si la ubicación remota es accesible.
|
|
|
Suggested by
Jose Luis Tirado
|
|
|
|
Located in
bzrlib/builtins.py:4268
|
|
483.
|
|
|
The results of the merge are placed into the destination working ![](/@@/translation-newline)
directory, where they can be reviewed (with bzr diff), tested, and then ![](/@@/translation-newline)
committed to record the result of the merge.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:4273
|
|
484.
|
|
|
merge refuses to run if there are any uncommitted changes, unless ![](/@@/translation-newline)
--force is given. If --force is given, then the changes from the source ![](/@@/translation-newline)
will be merged with the current working tree, including any uncommitted ![](/@@/translation-newline)
changes in the tree. The --force option can also be used to create a ![](/@@/translation-newline)
merge revision which has more than two parents.
|
|
|
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.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:4277
|
|
485.
|
|
|
If one would like to merge changes from the working tree of the other ![](/@@/translation-newline)
branch without merging any committed revisions, the --uncommitted option ![](/@@/translation-newline)
can be given.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:4283
|
|
486.
|
|
|
To select only some changes to merge, use "merge -i", which will prompt ![](/@@/translation-newline)
you to apply each diff hunk and file change, similar to "shelve".
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
In Ubuntu: |
|
Para seleccionar únicamente algunos cambios a combinar, use «merge -i», lo que ![](/@@/translation-newline)
le preguntará para aplicar cada grupo de diferencias y cambio de archivo, de ![](/@@/translation-newline)
forma similar a «shelve».
|
|
|
Suggested by
Jose Luis Tirado
|
|
|
|
Located in
bzrlib/builtins.py:4287
|
|
487.
|
|
|
:Examples:
To merge all new revisions from bzr.dev::
|
|
|
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.
|
|
|
|
:Ejemplos:
Para fusionar todas las revisiones nuevas de bzr.dev::
|
|
Translated and reviewed by
Paco Molinero
|
|
|
|
Located in
bzrlib/builtins.py:4290
|
|
488.
|
|
|
bzr merge ../bzr.dev
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
bzr merge ../bzr.dev
|
|
Translated and reviewed by
Paco Molinero
|
|
|
|
Located in
bzrlib/builtins.py:4293
|
|
489.
|
|
|
To merge changes up to and including revision 82 from bzr.dev::
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
Para fusionar cambios e incluir la revisión 82 desde bzr.dev::
|
|
Translated and reviewed by
Paco Molinero
|
|
|
|
Located in
bzrlib/builtins.py:4295
|
|
490.
|
|
|
bzr merge -r 82 ../bzr.dev
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
bzr merge -r 82 ../bzr.dev
|
|
Translated and reviewed by
Paco Molinero
|
|
|
|
Located in
bzrlib/builtins.py:4297
|
|
491.
|
|
|
To merge the changes introduced by 82, without previous changes::
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
Para fusionar los cambios introducidos por 82, sin cambios previos::
|
|
Translated and reviewed by
Paco Molinero
|
|
|
|
Located in
bzrlib/builtins.py:4299
|