|
472.
|
|
|
It sure does!
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
Да, он крут!
|
|
Translated and reviewed by
Sergey Basalaev
|
|
|
|
Located in
bzrlib/builtins.py:4236
|
|
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, ![](/@@/translation-newline)
or in the form of a path to a file containing a merge directive generated ![](/@@/translation-newline)
with bzr send. If neither is specified, the default is the upstream branch ![](/@@/translation-newline)
or the branch most recently merged using --remember. The source of the ![](/@@/translation-newline)
merge may also be specified in the form of a path to a file in another ![](/@@/translation-newline)
branch: in this case, only the modifications to that file are merged into ![](/@@/translation-newline)
the current working tree.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
Источник слияния может быть указан либо в виде ветки, либо в виде ![](/@@/translation-newline)
пути к файлу, содержащему директиву слияния, созданную командой bzr send. ![](/@@/translation-newline)
Если ничего не указано, в качестве источника используется самая новая ветка ![](/@@/translation-newline)
или ветка, которая наиболее часто использовалась для слияния с командой --remember. ![](/@@/translation-newline)
Источник слияния может быть также указан в виде пути к файлу в другой ветке: ![](/@@/translation-newline)
в этом случае только изменения в указанном файле объединяются в текущее ![](/@@/translation-newline)
рабочее дерево.
|
|
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 ![](/@@/translation-newline)
work from the other branch, automatically determining an appropriate base ![](/@@/translation-newline)
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 ![](/@@/translation-newline)
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 ![](/@@/translation-newline)
through OTHER, excluding BASE but including OTHER, will be merged. If this ![](/@@/translation-newline)
causes some revisions to be skipped, i.e. if the destination branch does ![](/@@/translation-newline)
not already contain revision BASE, such a merge is commonly referred to as ![](/@@/translation-newline)
a "cherrypick". Unlike a normal merge, Bazaar does not currently track ![](/@@/translation-newline)
cherrypicks. The changes look like a normal commit, and the history of the ![](/@@/translation-newline)
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 ![](/@@/translation-newline)
are some kinds of problems only a human can fix. When it encounters those, ![](/@@/translation-newline)
it will mark a conflict. A conflict means that you need to fix something, ![](/@@/translation-newline)
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
|