| <html> | |
| <head> | |
| <meta http-equiv="Content-Language" content="en-us"> | |
| <meta http-equiv="Content-Type" content="text/html; charset=windows-1252"> | |
| <title>Merge Manager View</title> | |
| </head> | |
| <body> | |
| <h1>Merge Manager View</h1> | |
| <img border="0" src="Merge_1.gif"><br> | |
| <h2>Purpose</h2> | |
| <p>The Merge Manager is used to resolve conflicts that arise when doing | |
| development on parallel branches. The Merge Manager makes conflicts that | |
| arise easily identifiable and then provides the means for resolving the | |
| conflicts, so that the working branch can be committed.</p> | |
| <h2>Icons</h2> | |
| <ul> | |
| <li> | |
| <img border="0" src="../../org.eclipse.osee.framework.ui.skynet/images/chkbox_disabled.gif" width="16" height="16"> | |
| Resolution has been started for the conflict</li> | |
| <li> | |
| <img border="0" src="../../org.eclipse.osee.framework.ui.skynet/images/accept.gif" width="16" height="16"> | |
| Conflict has been resolved and is ready to be committed, In the Merge column | |
| it means that the Source and Destination Branches have the same value even | |
| though they were both changed. </li> | |
| <li> | |
| <img border="0" src="../../org.eclipse.osee.framework.ui.skynet/images/chkbox_enabled_conflicted.gif" width="16" height="16"> | |
| After a conflict has been marked as resolved the value changed on the source | |
| or destination branch</li> | |
| <li> | |
| <img border="0" src="../../org.eclipse.osee.framework.ui.skynet/images/issue.gif" width="16" height="16"> | |
| A conflict that provides the user special information but does not need to | |
| be resolved</li> | |
| <li> | |
| <img border="0" src="../../org.eclipse.osee.framework.ui.skynet/images/red_light.gif" width="16" height="16"> | |
| A conflict that can not be resolved except by reverting the Artifact or | |
| Attribute, because it was deleted on the Destination Branch</li> | |
| <li> | |
| <img border="0" src="../../org.eclipse.osee.framework.ui.skynet/images/blue_d.gif" width="16" height="16"> | |
| Shows that the item defined by the column it is in has the Destination | |
| Branches value</li> | |
| <li> | |
| <img border="0" src="../../org.eclipse.osee.framework.ui.skynet/images/green_s.gif" width="16" height="16"> | |
| Shows that the item defined by the column it is in has the Source Branches | |
| value</li> | |
| <li> | |
| <img border="0" src="../../org.eclipse.osee.framework.ui.skynet/images/yellow_m.gif" width="16" height="16"> | |
| Shows that the item defined by the column it is in has a new value that is | |
| neither the Source Branch nor Destination Branch value.</li> | |
| <li> | |
| <img border="0" src="../../org.eclipse.osee.framework.ui.skynet/images/conflict.gif" width="16" height="16"> | |
| Shows that the conflict has not been given an initial value </li> | |
| <li> | |
| <img border="0" src="../../org.eclipse.osee.framework.ui.skynet/images/user.gif" width="16" height="16"> | |
| Opens the Associated Artifact for the merge</li> | |
| <li> | |
| <img border="0" src="../../org.eclipse.osee.framework.ui.skynet/images/branch_change_source.gif" width="16" height="16"> | |
| Opens up the Change Report for the Source Branch</li> | |
| <li> | |
| <img border="0" src="../../org.eclipse.osee.framework.ui.skynet/images/branch_change_dest.gif" width="16" height="16"> | |
| Opens up the Change Report for the Destination Branch</li> | |
| <li> | |
| <img border="0" src="../../org.eclipse.osee.framework.ui.skynet/images/refresh.gif" width="16" height="16"> | |
| Refreshes the Merge Manger view to find new conflicts</li> | |
| <li> | |
| <img border="0" src="../../org.eclipse.osee.framework.ui.skynet/images/customize.gif" width="16" height="16"> | |
| Allows the user to customize the Merge Manager tables</li> | |
| <li> | |
| <img border="0" src="../../org.eclipse.osee.framework.ui.skynet/images/bug.gif" width="16" height="16"> | |
| Report a bug with the Merge Manager</li> | |
| </ul> | |
| <h2>Overview</h2> | |
| <p>The Merge Manager is in place to find conflicts and help users resolve these | |
| conflicts. A conflict exists if the value of an attribute/artifact has | |
| changed on both the Destination and Source Branches. For reference the | |
| Source Branch is the users working branch. It is the branch that the user | |
| has been making changes to and would like to then add back into the Destination | |
| Branch or Baseline Branch. Both branches are identified by name in the | |
| header of the Merge Manager. </p> | |
| <p>Depending upon the conflict found, the user may have several choices for | |
| resolution. These include </p> | |
| <ul> | |
| <li>Accept the value on the Source Branch and overwrite the value on the | |
| Destination Branch</li> | |
| <li>Accept the value on the Destination Branch and do not add any of the | |
| Source Branch changes, (These will still show up as merged on | |
| <a href="change_table.html">Change Reports</a>)</li> | |
| <li>Create a solution that is a combination of the two changes </li> | |
| <li>Revert the changes on the Source Branch (This is the only | |
| available solution when the Artifact/Attribute was deleted on the | |
| Destination Branch, will show up as no change on the | |
| <a href="change_table.html">Change Report</a>)</li> | |
| <li>Do nothing (only possible for informational conflicts)</li> | |
| </ul> | |
| <p>Committing of Branches is blocked until all conflicts are resolved.</p> | |
| <h2>The GUI</h2> | |
| <p>The GUI is organized to provide the user with an ability to quickly identify | |
| conflicts.</p> | |
| <ul> | |
| <li><b>The Heading</b> - The Heading contains text to help identify what is | |
| being merged. It identifies the Source Branch, and the Destination Branch. | |
| It also provides the user with information about how many conflicts there | |
| are and if they have been resolved. The Heading also contains easy | |
| launch icons for additional tools in connection with the Merge Manager.</li> | |
| <li><b>The Conflict Resolution Column</b> - This column provides the user | |
| information about the state of the conflict. A blank entry in the | |
| column means that the conflict is new and has not had any actions performed | |
| on it. A | |
| <img border="0" src="../../org.eclipse.osee.framework.ui.skynet/images/chkbox_disabled.gif" width="16" height="16"> | |
| indicates that conflict is in the modified state. This means the user | |
| has begun merging the conflict but has not marked it as resolved. The | |
| user may transition it into the resolved state by left clicking on the | |
| <img border="0" src="../../org.eclipse.osee.framework.ui.skynet/images/chkbox_disabled.gif" width="16" height="16"> | |
| icon. The | |
| <img border="0" src="../../org.eclipse.osee.framework.ui.skynet/images/accept.gif" width="16" height="16"> | |
| icon indicates the user has marked the conflict as resolved. This | |
| means they have selected a value for it and have verified the value going in | |
| is what they want. No additional changes are allowed on a conflict | |
| once it is in the resolved state. It can be placed back into the | |
| modified state by left clicking on the | |
| <img border="0" src="../../org.eclipse.osee.framework.ui.skynet/images/accept.gif" width="16" height="16"> | |
| icon. The | |
| <img border="0" src="../../org.eclipse.osee.framework.ui.skynet/images/chkbox_enabled_conflicted.gif" width="16" height="16"> | |
| means that a conflict was in the resolved state but a new change has | |
| occurred on either the Source or Destination Branch. It serves to | |
| notify the user that the conflict was not in the finalized state when they | |
| resolved the conflict. The user can return to resolved state by left | |
| clicking on the | |
| <img border="0" src="../../org.eclipse.osee.framework.ui.skynet/images/chkbox_enabled_conflicted.gif" width="16" height="16"> | |
| icon. The | |
| <img border="0" src="../../org.eclipse.osee.framework.ui.skynet/images/red_light.gif" width="16" height="16"> | |
| icon indicates that an Artifact or Attribute must be reverted on the Source | |
| Branch. This indicates that the Artifact/Attribute was deleted on the | |
| Destination Branch and can not have a change committed onto it. The | |
| user must abandon any change to that artifact attribute by using the revert | |
| command. Once the Artifact/Attribute has been reverted the Merge | |
| Manager will be refreshed and the conflict will be removed. The | |
| <img border="0" src="../../org.eclipse.osee.framework.ui.skynet/images/issue.gif" width="16" height="16">icon | |
| indicates an informational conflict. The user does not have to take | |
| any action to resolve these conflicts. It just provides the | |
| information that the Source Branch deleted the Artifact/Attribute but the | |
| Destination Branch has been modified. The user is free to act as | |
| desired based on the provided information.</li> | |
| <li><b>The Artifact Name Column</b> - This column tells which artifact the | |
| conflict occurred on. If the name is different between the Source and | |
| Destination Branches, (this will show up as a conflict) it will at first | |
| showing use the Source Branch value and then use whatever the name is | |
| resolved to be after that has occurred.</li> | |
| <li><b>The Artifact Type Column</b> - Simply lists what type of Artifact is | |
| conflicted</li> | |
| <li><b>The Conflicting Item Column</b> - In the case of an attribute | |
| conflict it states what attribute type is conflicting. In the case of | |
| an artifact conflict it will always say "Artifact State"</li> | |
| <li><b>The Source Value Column</b> - When possible this column tells what | |
| value the Source Branch has for the conflict. It will always have a | |
| <img border="0" src="../../org.eclipse.osee.framework.ui.skynet/images/green_s.gif" width="16" height="16"> | |
| icon. If the conflicting item is Word Formatted Content the words "Stream | |
| data" will be shown. For artifact conflicts it will either show | |
| "Modified" or "Deleted". Left clicking on the | |
| <img border="0" src="../../org.eclipse.osee.framework.ui.skynet/images/green_s.gif" width="16" height="16"> | |
| icon will populate the Merge Branch with value found on the Source Branch.</li> | |
| <li><b>The Destination Value Column</b> - When possible this column tells | |
| what value the Destination Branch has for the conflict. It will always | |
| have a | |
| <img border="0" src="../../org.eclipse.osee.framework.ui.skynet/images/blue_d.gif" width="16" height="16"> | |
| icon. If the conflicting item is Word Formatted Content the words "Stream | |
| data" will be shown. For artifact conflicts it will either show | |
| "Modified" or "Deleted". Left clicking on the | |
| <img border="0" src="../../org.eclipse.osee.framework.ui.skynet/images/blue_d.gif" width="16" height="16"> | |
| icon will populate the Merge Branch with value found on the Destination | |
| Branch.</li> | |
| <li><b>The Merge Value Column</b> - The Merged Value column serves to show | |
| the user the value that has been selected for use when the Branch is | |
| committed. The Merge value is actually kept on a new "Merge Branch" | |
| and so any changes made to it will not affect the value seen on the Source | |
| or Destination Branches. When the Merge Value column is blank with no | |
| icon, the conflict is informational and no actions are provided. When | |
| the Merge Value column contains a | |
| <img border="0" src="../../org.eclipse.osee.framework.ui.skynet/images/conflict.gif" width="16" height="16">icon | |
| the value has not been set. This is the icon that should be shown for all | |
| conflicts (Except informational conflicts, or same value conflicts) the | |
| first time the user brings up the merge manager. The | |
| <img border="0" src="../../org.eclipse.osee.framework.ui.skynet/images/green_s.gif" width="16" height="16"> | |
| icon indicates that the Source Value was selected as the final value. | |
| The actual Source Value text will also be shown in this column if possible. | |
| The | |
| <img border="0" src="../../org.eclipse.osee.framework.ui.skynet/images/blue_d.gif" width="16" height="16"> | |
| icon indicates that the Destination Value was selected as the final value. | |
| The Destination Value text will also be shown in this column if possible. | |
| The | |
| <img border="0" src="../../org.eclipse.osee.framework.ui.skynet/images/yellow_m.gif" width="16" height="16"> | |
| icon will be shown when a new value has been selected for the final value. | |
| This indicates that the user has modified the final value so that it is no | |
| longer a copy of the Source or Destination, but some variation thereof. | |
| A | |
| <img border="0" src="../../org.eclipse.osee.framework.ui.skynet/images/accept.gif" width="16" height="16"> | |
| icon indicates that although both the Source Branch Value and Destination | |
| Branch Value have changed they were both changed to the same value and so | |
| there is not really a conflict. Left clicking on the icon in the Merge Value | |
| column will bring up the Merge Wizard or in the case of un-resolvable | |
| conflicts a dialog offering the ability to revert the conflicting item.</li> | |
| <li><b><a name="The_Right_Click_Menu">The Right Click Menu</a></b> - Right clicking on any row will display a | |
| menu with options for dealing with conflicts. | |
| <ul> | |
| <li>"Set Source as Default Branch" - This selection is a quick way to set | |
| the Source Branch as the default branch. If the Source Branch is | |
| already set as the Default Branch, the menu item will be grayed out and | |
| there will be a check mark next to the option.</li> | |
| <li>"Set Destination as Default Branch" - This selection is a quick way to | |
| set the Destination Branch as the default branch. If the Destination | |
| Branch is already set as the Default Branch, the menu item will be grayed | |
| out and there will be a check mark next to the option.</li> | |
| <li>"Edit Merge Artifact" - This option is only enabled for Word Formatted | |
| Content conflicts and will bring up the Merge Artifact in Word. The | |
| Merge Artifact is a separate version of the artifact that will preserve the | |
| details of the Merge, and will be reviewable in the Merge Manager after an | |
| artifact is committed. IMPORTANT: If the user makes the changes to | |
| their Source Branch instead of on the Merge Artifact the Merge Manager will | |
| incorrectly represent the merge in future reviews.</li> | |
| <li>"Generate Three Way Merge" - Will generate a <a href="#Three_Way_Merge"> | |
| Three Way Merge</a> for the Word Formatted Content.</li> | |
| <li>"Preview" -> "Preview Source Artifact", "Preview Destination Artifact", | |
| "Preview Merge Artifact" will show a preview in Word of the Artifact based | |
| on the version selected.</li> | |
| <li>"Differences" -> "Show Source Branch Differences", "Show Destination | |
| Branch Differences", "Show Source/Destination Differences", "Show | |
| Source/Merge Differences", "Show Destination/Merge Differences" will | |
| generate differences based upon which option is selected. Allows the | |
| user to see how different versions of the artifact differ.</li> | |
| <li>"Reveal Artifact in Explorer" - This option is only available when | |
| either the Source or Destination Branch is set as the default branch. | |
| When such is the case this will reveal the artifact in the Artifact Explorer | |
| for the Branch that is the default branch.</li> | |
| <li>"Resource History" - This option is only available when either the | |
| Source or Destination Branch is set as the default branch. When such | |
| is the case this will reveal the resource history of the artifact on the | |
| Branch that is the default branch.</li> | |
| </ul></li> | |
| </ul> | |
| <p> </p> | |
| <h2>Resolution Of Conflicts</h2> | |
| <p>For <a href="#Word_Formatted_Content">Word Formatted Content</a> conflicts see the section below. This | |
| section addresses all other conflicts.</p> | |
| <ul> | |
| <li><b>Informational Conflicts</b><p>Informational conflicts are identified by | |
| the | |
| <img border="0" src="../../org.eclipse.osee.framework.ui.skynet/images/issue.gif" width="16" height="16"> | |
| 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 <a href="#The_Right_Click_Menu">right | |
| click menu</a> 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.</p> | |
| <p> </li> | |
| <li><b>Un-resolvable Conflicts</b><p>Un-resolvable Conflicts are identified | |
| by the | |
| <img border="0" src="../../org.eclipse.osee.framework.ui.skynet/images/red_light.gif" width="16" height="16"> | |
| 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.</p> | |
| <p> </li> | |
| <li><b>Attribute Conflicts</b><p>Attribute Conflicts occur when both the | |
| Destination and Source branch modify an attribute. This section will | |
| cover all attributes except <a href="#Word_Formatted_Content">Word Formatted | |
| Content</a> 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 | |
| <img border="0" src="../../org.eclipse.osee.framework.ui.skynet/images/green_s.gif" width="16" height="16"> | |
| icon in the Source Value column. This will copy the | |
| <img border="0" src="../../org.eclipse.osee.framework.ui.skynet/images/green_s.gif" width="16" height="16"> | |
| 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 | |
| <img border="0" src="../../org.eclipse.osee.framework.ui.skynet/images/blue_d.gif" width="16" height="16"> | |
| icon in the Destination Value column. This will copy the | |
| <img border="0" src="../../org.eclipse.osee.framework.ui.skynet/images/blue_d.gif" width="16" height="16"> | |
| icon and the value displayed in the Source Value column into the Merged | |
| Value Column. Both of these options are also available from the | |
| <a href="#Wizard">Merge | |
| Wizard</a> (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 | |
| <img border="0" src="../../org.eclipse.osee.framework.ui.skynet/images/yellow_m.gif" width="16" height="16"> | |
| icon in the Merged Value column along with the new value. The user then right clicks on the | |
| <img border="0" src="../../org.eclipse.osee.framework.ui.skynet/images/chkbox_disabled.gif" width="16" height="16"> | |
| in the Conflict Status Column so that the | |
| <img border="0" src="../../org.eclipse.osee.framework.ui.skynet/images/accept.gif" width="16" height="16"> | |
| icon is displayed. The conflict is resolved and will allow the | |
| Source Branch to be committed.</p> | |
| <p align="center"> | |
| <a name="Wizard"> | |
| <img border="0" src="Merge_4.gif"></a> </p> | |
| <p align="center"> | |
| <font size="4">The Merge Wizard</font></p> | |
| </li> | |
| </ul> | |
| <h2>Resolution Of Conflicts (<a name="Word_Formatted_Content">Word Formatted Content</a>)</h2> | |
| <p>Resolution of conflicts is provided in two different ways. They can | |
| either copy and paste the changes into their Merge Artifact document or they can | |
| generate a Three Way Merge and accept the changes that show up in the generated | |
| document. Both approaches have their advantages and disadvantages and are | |
| best suited for different situations. They can also be combined where the | |
| situation warrants it, however the three way merge must always be done first if | |
| this is the case.</p> | |
| <ul> | |
| <li> | |
| <h3><b>Manual Merging</b></h3> | |
| <ul> | |
| <li><b>Usage</b><ul> | |
| <li>When one version of the artifact has many changes and the other | |
| version has very few changes</li> | |
| <li>When both files have formatting changes</li> | |
| <li>When three way merging generates a complex document</li> | |
| <li>When both versions edit the same text in multiple places</li> | |
| </ul> | |
| <p>Manual Merging is the process of combining the Source Branch changes | |
| and the destination branch changes manually by copying and pasting them | |
| into the Merge Artifact document. The Merge Artifact is a separate | |
| version of the artifact that will preserve the details of the Merge, and | |
| will be reviewable in the Merge Manager after an artifact is committed. | |
| IMPORTANT: If the user makes the changes to their Source Branch instead | |
| of on the Merge Artifact the Merge Manager will incorrectly represent | |
| the merge in future reviews.</p> | |
| The following procedure illustrates the functionality available | |
| to facilitate a manual merge.</p> | |
| <p>The user will first either launch the <a href="#WFC Wizard">Merge Wizard</a> by left clicking | |
| on the icon in the Merge Value column of the GUI or they may select the | |
| functionality from the <a href="#The_Right_Click_Menu">right click menu</a> for the conflict in question. | |
| The first thing to do is to bring up a word document comparison of both | |
| the Source Branch Version and the Destination Branch Version. | |
| These documents will show all of the changes that have been made to | |
| these two artifacts since the Source Branch was created. To launch | |
| these difference's the user either select "Show Source Diff" and "Show | |
| Destination Diff" from the wizard or "Differences"->"Show Source Branch | |
| Differences" and "Differences"->"Show Destination Branch Differences" | |
| from the right click menu</a>. These will bring up the two | |
| difference's in different Word instances with window labels to allow the | |
| user to differentiate the files. The intention of bringing up | |
| these difference's is twofold. Firstly, it allows the user to | |
| identify the file that has the most changes. Secondly, it will | |
| come in use later when the user copy's and paste's changes into the | |
| Merge document.</p> | |
| <p>Upon identifying the branch that has the most changes the user should | |
| then set the Merge Artifact to contain that branches value. This | |
| is done by either selecting "Populate with Source Data" or "Populate | |
| with Destination Data" from the Merge Wizard or left clicking on the | |
| <img border="0" src="../../org.eclipse.osee.framework.ui.skynet/images/green_s.gif" width="16" height="16"> | |
| icon or the | |
| <img border="0" src="../../org.eclipse.osee.framework.ui.skynet/images/blue_d.gif" width="16" height="16"> | |
| icon in the Source and Destination Value columns in the Merge Manager | |
| GUI. The user can then bring up the Merge Artifact for editing by | |
| clicking on "Edit Merge Artifact" in the Merge Wizard or in the right | |
| click menu. The Document that comes up contains the Merge Artifact | |
| and any changes made to it will be reflected when the Source Branch is | |
| committed. The user can than begin to copy the changes from the | |
| diff report that showed the fewest changes (opposite of the one chosen | |
| as the baseline). After all changes have been migrated into the | |
| Merge Artifact document the user than saves the document, which will | |
| preserve the Merge Artifact value. The user should be aware that | |
| any changes they do not wish to preserve from either the Source or | |
| Destination version of the Artifact need to be omitted on the Merge | |
| Artifact. </p> | |
| <p>The user then right clicks on the | |
| <img border="0" src="../../org.eclipse.osee.framework.ui.skynet/images/chkbox_disabled.gif" width="16" height="16"> | |
| in the Conflict Status Column so that the | |
| <img border="0" src="../../org.eclipse.osee.framework.ui.skynet/images/accept.gif" width="16" height="16"> | |
| icon is displayed. The conflict is resolved and will allow the | |
| Source Branch to be committed.</p> | |
| <p> </p></li> | |
| </ul> | |
| </li> | |
| <li> | |
| <h3 align="left"><b><a name="Three_Way_Merge">Three Way Merge</a></b></h3> | |
| <ul> | |
| <li> | |
| <p align="left"><b>Usage</b><ul> | |
| <li> | |
| <p align="left">When both versions have many changes or both versions have few | |
| changes.</li> | |
| <li> | |
| <p align="left">When only one file has formatting changes (Must be combined with | |
| Manual Merging in this case)</li> | |
| <li> | |
| <p align="left">When three way merging generates an understandable document</li> | |
| </ul> | |
| <p align="left">Three Way Merging leverages Microsoft Words ability to merge | |
| documents. At the beginning of any Word Formatted Content merge it | |
| is recommended that user generate a Three Way Merge and check the | |
| complexity of the document. In most cases Three Way Merging is a | |
| quicker way to merge two documents, however in some cases the Three Way | |
| Merge will generate a document that is difficult to use and understand. | |
| This usually arises when the Source and Destination branches have edited | |
| the same text or if one of the branches has touched a large percentage | |
| of the file. As it runs fairly quickly it is always a good idea to | |
| run it at the beginning of a Merge to check if it is useful. Three | |
| Way Merging only allows the user to maintain format changes from one of | |
| the documents. If format changes are made on both documents the | |
| Three Way Merge will prompt the user as to which format changes they | |
| would like to maintain, the user will then need to copy the format | |
| changes from the other document into the Merge Artifact document | |
| manually.</p> | |
| <p align="left">A Three Way Merge is generated by selecting Generate Three Way Merge | |
| from either the <a href="#WFC Wizard">Merge Wizard</a> or the <a href="#The_Right_Click_Menu">right click menu</a>. IMPORTANT: | |
| Generating a Three Way Merge will discard any changes made to the Merge | |
| Artifact, therefore a prompt will make sure this is the intended | |
| operation. If a user had started a Three Way Merge previously but | |
| had not completed the Merge the user is also given the option of | |
| continuing the previous Merge in the prompt (Selecting Edit Merge | |
| Artifact will also have this effect). The following is an example of a | |
| Three Way Merge in Word.<p align="center"><img border="0" src="Merge_3.gif"> | |
| </p> | |
| <p align="center"><font size="4">A Three Way Merge</font></p><p> | |
| The changes made by the Source Branch and Destination Branch are shown | |
| in different colors in the Word Document. In this particular case | |
| the changes made in Red were done by the Source Branch and the changes | |
| made in Blue were done on the Destination Branch. The color scheme | |
| is not consistent and the user needs to verify which color equates to | |
| which changes by hovering there mouse over one of the changes. A | |
| popup will be shown which will identify the author. The following | |
| <a href="http://office.microsoft.com/en-us/word/HA010983881033.aspx"> | |
| Guide</a> will explain how to resolve the changes in the document. | |
| IMPORTANT: All changes must be either accepted or rejected before the | |
| conflict can be marked as resolved. After the user has resolved | |
| all the changes it is a good idea to do generate a difference document | |
| between the Source Artifact and the Merge Artifact, and the Destination | |
| Artifact and the Merge Artifact by selecting "Show Source/Merge Diff" | |
| and "Show Destination/Merge Diff" from the merge Wizard or | |
| "Differences"->"Show Source/Merge Differences" and "Differences"->"Show | |
| Destination/Merge Differences" from the | |
| <a href="#The_Right_Click_Menu">right click menu</a>. These | |
| views will show the differences between the branch artifact and the | |
| merge artifact. For the Source/Merge difference this will show | |
| everything that is different between the source document and the Merge | |
| document. In the case where the user accepts all changes from the | |
| source and destination branches this diff will highlight all of the | |
| changes that occurred on the destination branch. In the | |
| Destination/Merge diff it will highlight all of the changes that | |
| happened on the source branch. It is always possible to use Manual | |
| Merging techniques in conjunction with Three Way Merging.</p> | |
| <p>The user then right clicks on the | |
| <img border="0" src="../../org.eclipse.osee.framework.ui.skynet/images/chkbox_disabled.gif" width="16" height="16"> | |
| in the Conflict Status Column so that the | |
| <img border="0" src="../../org.eclipse.osee.framework.ui.skynet/images/accept.gif" width="16" height="16"> | |
| icon is displayed. The conflict is resolved and will allow the | |
| Source Branch to be committed.</p> | |
| <p align="center"><a name="WFC Wizard"> | |
| <img border="0" src="Merge_5.gif"></a></p> | |
| <p align="center"><font size="4">Word Formatted Content Merge Wizard</font></p> | |
| </li> | |
| </ul> | |
| </li> | |
| </ul> | |
| <h2>Additional Features</h2> | |
| <p>The Merge Wizard contains a "Clear the Merge Artifact" that is not available | |
| from the right click menu and only available for Word Formatted Content. This will empty out the Merge artifact and | |
| allow the user to start with an empty document for editing. It will also | |
| place a | |
| <img border="0" src="../../org.eclipse.osee.framework.ui.skynet/images/conflict.gif" width="16" height="16">icon | |
| in the merge value column for that conflict.</p> | |
| <p> </p> | |
| <p> </p> | |
| </body> | |
| </html> |