|
|
515.
|
|
|
Redo a merge.
|
|
|
|
|
Повторить слияние.
|
|
Translated by
Yuri Matronov
|
|
Reviewed by
Alex
|
|
|
|
Located in
bzrlib/builtins.py:4653
|
|
|
516.
|
|
|
Use this if you want to try a different merge technique while resolving 
conflicts. Some merge techniques are better than others, and remerge
lets you try different ones on different files. |
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
Используйте, если Вы хотите попробовать другой метод слияния при решении конфликтов.
Одни методы слияния лучше, чем другие, и remerge (повтор слияния)
позволяет попробовать различные варианты на разных файлах. |
|
Translated and reviewed by
Alex
|
|
|
|
Located in
bzrlib/builtins.py:4655
|
|
|
517.
|
|
|
The options for remerge have the same meaning and defaults as the ones for
merge. The difference is that remerge can (only) be run when there is a
pending merge, and it lets you specify particular files. |
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:4659
|
|
|
518.
|
|
|
:Examples:
Re-do the merge of all conflicted files, and show the base text in
conflict regions, in addition to the usual THIS and OTHER texts:: |
|
|
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:4663
|
|
|
519.
|
|
|
bzr remerge --show-base
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:4667
|
|
|
520.
|
|
|
Re-do the merge of "foobar", using the weave merge algorithm, with
additional processing to reduce the size of conflict regions::
|
|
|
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:4669
|
|
|
521.
|
|
|
bzr remerge --merge-type weave --reprocess foobar
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:4672
|
|
|
522.
|
|
|
Show base revision text in conflicts.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:4679
|
|
|
523.
|
|
|
Sorry, remerge only works after normal merges. Not cherrypicking or multi-merges.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:4691
|
|
|
524.
|
|
|
Set files in the working tree back to the contents of a previous revision.
|
|
|
|
|
Вернуть файлы в рабочем дереве к содержанию предыдущей ревизии.
|
|
Translated and reviewed by
Alex
|
|
|
|
Located in
bzrlib/builtins.py:4749
|
