|
2012.
|
|
|
* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,
* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,
* ``--action=done`` will just mark the conflict as resolved.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
en/help_topics/conflict-types.txt:139
|
|
2035.
|
|
|
* ``--action=take-this`` will acknowledge Bazaar choice to keep the directory,
|
|
|
|
(no translation yet)
|
|
|
|
Located in
en/help_topics/conflict-types.txt:254
|
|
2036.
|
|
|
* ``--action=take-other`` will issue ``bzr rm directory`` including the
children,
|
|
|
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
en/help_topics/conflict-types.txt:256
|
|
2037.
|
|
|
* ``--action=done`` will just mark the conflict as resolved.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
en/help_topics/conflict-types.txt:259
|
|
2038.
|
|
|
Note that when merging a directory deletion, if unversioned files are
present, they become potential orphans has they don't have a directory
parent anymore.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
en/help_topics/conflict-types.txt:261
|
|
2039.
|
|
|
Handling such orphans, *before* the conflict is created, is controlled by
setting the ``bzr.transform.orphan_policy`` configuration option.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
en/help_topics/conflict-types.txt:265
|
|
2040.
|
|
|
There are two possible values for this option:
|
|
|
|
(no translation yet)
|
|
|
|
Located in
en/help_topics/conflict-types.txt:268
|
|
2041.
|
|
|
* ``conflict`` (the default): will leave the orphans in place and
generate a conflicts,
|
|
|
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
en/help_topics/conflict-types.txt:270
|
|
2042.
|
|
|
* ``move``: will move the orphans to a ``bzr-orphans`` directory at the root
of the working tree with names like ``<file>.~#~``.
|
|
|
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
en/help_topics/conflict-types.txt:273
|
|
2043.
|
|
|
Path conflict
-------------
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
en/help_topics/conflict-types.txt:278
|