29.01.2013 Views

WebSphere Application Server - IBM Redbooks

WebSphere Application Server - IBM Redbooks

WebSphere Application Server - IBM Redbooks

SHOW MORE
SHOW LESS

You also want an ePaper? Increase the reach of your titles

YUMPU automatically turns print PDFs into web optimized ePapers that Google loves.

When such a situation occurs, you will be able to view the differences between<br />

these three different resource versions:<br />

► The resource in the workbench<br />

► The version of the resource that is committed in the branch<br />

► The common ancestor on which the two conflicting versions is based<br />

The differences that will be highlighted show you what has been changed in the<br />

workbench resource as compared to the common ancestor, and what has been<br />

changed in the branch resource as compared to the common ancestor.<br />

A typical scenario to do this comparison would be:<br />

1. Synchronize with the repository.<br />

2. Open the Show only conflicts.<br />

3. Select a resource that is in conflict and open it in the Text Compare area by<br />

double-clicking it.<br />

Figure 15-14 Two-way compare<br />

4. Select the Show Ancestor button to have the original file come up.<br />

546 <strong>IBM</strong> <strong>WebSphere</strong> <strong>Application</strong> <strong>Server</strong> - Express V5.0.2 Developer Handbook

Hooray! Your file is uploaded and ready to be published.

Saved successfully!

Ooh no, something went wrong!