Merging Editions of a Class or Interface

You can use the VisualAge for Java comparison browser to reconcile source code differences between two editions of a class or interface.

tentergf.gif (577 bytes) In the team environment, a class developer or class owner may compare editions to review changes made by other members of the team, and to merge those changes into a single open edition. The person who does the reconciliation would then version the merged edition, so the class owner can release it.

For information on using the comparison browser, see the related topic on comparing editions.

To update an open edition of a class or interface that is in the workspace, with changes from another version in the repository, do the following steps:

  1. From the Workbench window, select a class or interface and compare it to another edition. The comparison results window will open.
  2. As you select each method that is listed in the Differences pane, the two source panes will show you where the editions do not match. The source pane marked with an asterisk (*) contains the edition that is in the workspace. This is the edition into which you must merge your changes, if you want to save the results later.
  3. To merge selected differences from one edition into another, as they are highlighted, open the pop-up menu in the target source pane and select Replace with Alternative. You will see the source code change.

    To merge all source code differences from one edition into another, select Load Right or Load Left from the method's pop-up menu in the Differences pane. Load Right will merge source from the edition shown on the right into the edition shown on the left. Load Left will merge from left to right.

When you have removed all differences between two editions of a class or interface, that program element will be removed from the Differences pane of the comparison window.

ngrelc.gif (533 bytes)
Repository
Workspace
Editions and Versioning

ngrelt.gif (466 bytes)
Comparing Editions of a Program Element
Comparing Two Program Elements
Browsing the Workspace
Searching for a Program Element in the Repository