|
|
481.
|
|
|
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
|
|
|
|
|
Используйте bzr resolve после устранения проблемы. Смотрите также bzr conflicts.
|
|
Translated and reviewed by
Alex
|
|
|
|
Located in
bzrlib/builtins.py:4296
|
|
|
482.
|
|
|
If there is no default branch set, the first merge will set it (use 
--no-remember to avoid setting it). After that, you can omit the branch
to use the default. To change the default, use --remember. The value will
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)
|
|
|
|
Located in
bzrlib/builtins.py:4298
|
|
|
483.
|
|
|
The results of the merge are placed into the destination working
directory, where they can be reviewed (with bzr diff), tested, and then
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:4303
|
|
|
484.
|
|
|
merge refuses to run if there are any uncommitted changes, unless
--force is given. If --force is given, then the changes from the source
will be merged with the current working tree, including any uncommitted
changes in the tree. The --force option can also be used to create a
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:4307
|
|
|
485.
|
|
|
If one would like to merge changes from the working tree of the other
branch without merging any committed revisions, the --uncommitted option
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:4313
|
|
|
486.
|
|
|
To select only some changes to merge, use "merge -i", which will prompt
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)
|
|
|
|
Located in
bzrlib/builtins.py:4317
|
|
|
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.
|
|
|
|
|
:Примеры:
Для слияния всех новых ревизий из bzr.dev:: |
|
Translated by
Yuri Matronov
|
|
Reviewed by
Alex
|
|
|
|
Located in
bzrlib/builtins.py:4320
|
|
|
488.
|
|
|
bzr merge ../bzr.dev
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
|
bzr merge ../bzr.dev
|
|
Translated by
Sergej セルゲイ
|
|
Reviewed by
Alex
|
|
|
|
Located in
bzrlib/builtins.py:4323
|
|
|
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.
|
|
|
|
|
Для слияния изменений вплоть до ревизии 82 включительно из bzr.dev::
|
|
Translated and reviewed by
Alex
|
|
|
|
Located in
bzrlib/builtins.py:4325
|
|
|
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 by
gavenkoa
|
|
Reviewed by
Alex
|
|
|
|
Located in
bzrlib/builtins.py:4327
|
