You can use the VisualAge for Java comparison browser to reconcile source code differences between two editions of a class or interface.
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:
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.
Repository
Workspace
Editions and Versioning
Comparing Editions of a Program Element
Comparing Two Program Elements
Browsing the Workspace
Searching for a Program Element in the Repository