|
|
| (2 intermediate revisions by the same user not shown) |
| Line 1: |
Line 1: |
| − | == Resolution Of Conflicts == | + | ==How to ... deal with conflicts== |
| | | | |
| − | <br>For Word Formatted Content conflicts see the section below. This section addresses all other conflicts.
| + | A conflict is when the information on the target and destination branches cannot be reconciled. |
| − | | + | *[[OSEE/HowTo/Commit/ResolveConflicts|'''Resolve conflicts''']] |
| − | === Informational Conflicts ===
| + | |
| − | | + | |
| − | Informational conflicts are identified by the [[Image:OSEE_issue.gif]] icon in the conflict resolution column in the GUI. Informational conflicts require no action by the user, and no actions are provided in the GUI other than the ability to use the right click menu to examine the artifact using the tools provided there. An informational conflict is generated when the Source branch deletes an Artifact or an Attribute and that same Artifact or Attribute was modified on the Destination Branch. This is to allow the user the opportunity to review a change that was made on the Destination Branch that might make them want to take some action in regards to their deletion.
| + | |
| − | | + | |
| − | <br>
| + | |
| − | | + | |
| − | === Un-resolvable Conflicts ===
| + | |
| − | | + | |
| − | Un-resolvable Conflicts are identified by the [[Image:OSEE_red_light.gif]] icon in the conflict resolution column of the GUI. This conflicts require the user to revert the Artifact or Attribute that caused the conflict on the Source Branch. An Un-resolvable conflict is caused when the Destination Branch deletes an Artifact or Attribute while the Source Branch modifies that same Artifact, Attribute. The reason the user must revert their changes is that committing in their changes would essentially undo that deletion and bring that item back into existence. If the deletion should not have happened the user needs to talk with the committer of the deletion to resolve the issue.
| + | |
| − | | + | |
| − | <br>
| + | |
| − | | + | |
| − | === Attribute Conflicts ===
| + | |
| − | | + | |
| − | Attribute Conflicts occur when both the Destination and Source branch modify an attribute. This section will cover all attributes except Word Formatted Content Attributes. The resolution of these Attribute values provide three options. Use the Source attribute value, use the destination attribute value, use a modified value that is some combination of the source and destination values. In order to use the Source Value the user may left click on the [[Image:OSEE_green_s.gif]] icon in the Source Value column. This will copy the [[Image:OSEE_green_s.gif]] icon and the value displayed in the Source Value column into the Merged Value Column. In order to use the Destination Value the user may left click on the [[Image:OSEE_blue_d.gif]] icon in the Destination Value column. This will copy the [[Image:OSEE_blue_d.gif]] icon and the value displayed in the Source Value column into the Merged Value Column. Both of these options are also available from the Merge Wizard (Left click on the icon in the Merge Value column) with the "Load Source Data" and "Load Destination Value" buttons. In order to modify the value to some combination the user must bring up the Merge Wizard which has an embedded editor specific to the attribute that needs to be modified. Once the value is accurately entered in the editor the user may than select "Finish" This will place a [[Image:OSEE_yellow_m.gif]] icon in the Merged Value column along with the new value. The user then right clicks on the [[Image:OSEE_chkbox_disabled.gif]] in the Conflict Status Column so that the [[Image:OSEE_accept.gif]] icon is displayed. The conflict is resolved and will allow the Source Branch to be committed.
| + | |
Latest revision as of 08:31, 30 April 2010
How to ... deal with conflicts
A conflict is when the information on the target and destination branches cannot be reconciled.
