|
|
473.
|
|
|
merge base is revision %s 
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
основанием слияния является ревизия %s
|
|
Translated by
Sergej セルゲイ
|
|
Reviewed by
Alex
|
|
|
|
Located in
bzrlib/builtins.py:4260
|
|
|
474.
|
|
|
Perform a three-way merge.
|
|
|
|
|
Выполнить трехстороннее слияние.
|
|
Translated by
gavenkoa
|
|
Reviewed by
Alex
|
|
|
|
Located in
bzrlib/builtins.py:4264
|
|
|
475.
|
|
|
The source of the merge can be specified either in the form of a branch,
or in the form of a path to a file containing a merge directive generated
with bzr send. If neither is specified, the default is the upstream branch
or the branch most recently merged using --remember. The source of the
merge may also be specified in the form of a path to a file in another
branch: in this case, only the modifications to that file are merged into
the current working tree. |
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
Источник слияния может быть указан либо в виде ветки, либо в виде
пути к файлу, содержащему директиву слияния, созданную командой bzr send.
Если ничего не указано, в качестве источника используется самая новая ветка
или ветка, которая наиболее часто использовалась для слияния с командой --remember.
Источник слияния может быть также указан в виде пути к файлу в другой ветке:
в этом случае только изменения в указанном файле объединяются в текущее
рабочее дерево. |
|
Translated and reviewed by
Alex
|
|
|
|
Located in
bzrlib/builtins.py:4266
|
|
|
476.
|
|
|
When merging from a branch, by default bzr will try to merge in all new
work from the other branch, automatically determining an appropriate base
revision. If this fails, you may need to give an explicit base. |
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:4274
|
|
|
477.
|
|
|
To pick a different ending revision, pass "--revision OTHER". bzr will
try to merge in all new work up to and including revision OTHER. |
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:4278
|
|
|
478.
|
|
|
If you specify two values, "--revision BASE..OTHER", only revisions BASE
through OTHER, excluding BASE but including OTHER, will be merged. If this
causes some revisions to be skipped, i.e. if the destination branch does
not already contain revision BASE, such a merge is commonly referred to as
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
cherrypicks. The changes look like a normal commit, and the history of the
changes from the other branch is not stored in the commit. |
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:4281
|
|
|
479.
|
|
|
Revision numbers are always relative to the source branch.
|
|
|
|
|
Номера ревизий всегда относительны к исходной ветке.
|
|
Translated and reviewed by
Alex
|
|
|
|
Located in
bzrlib/builtins.py:4289
|
|
|
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. |
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:4291 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
|
|
|
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
|
