You can resolve an
editable difference node by either applying a value from one of the contributors,
or by editing its value directly on the Edit page. This topic describes the
steps and guidelines for working in the Edit page.
- Using the difference navigation
buttons, select the node that you want to edit. The difference can be resolved
or unresolved, but it must be a difference node, and it must be an editable
node type.
- Click the Edit tab.
- Edit the difference node. You
can enter text on the Edit page in a variety of ways, including:
- Typing or pasting text directly in the edit area.
- Clicking one of the
Merge
from contributor buttons to applying the current node from a contributor.
The text value is inserted in the edit area.
You can enter any text, including character references. Please note editing restrictions.
At any point while editing,
you can discard your changes by pressing the Escape key. The merge view toggles
back to the tree view without saving the edited value.
- When you have finished editing,
click the Merge tab to return to the tree view.
Editing restrictions
The
following restrictions apply to editing merge output nodes:
- You can only edit difference nodes.
- You cannot change the node type.
- You cannot change a non-difference node to a difference node.
- You cannot move a node.
- You can select only one contributor or value to edit.