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.

Figure 15-7 Synchronizing with the repository<br />

To see the difference in a workspace resource and the same resource in the<br />

repository, double-click the resource in the Structure Compare area and both<br />

versions will be opened in the Text Compare area. The workbench file is on<br />

the left side and the repository file is on the right side.<br />

15.6.2 Dealing with conflicting changes<br />

If you have modified a resource and no one else has committed a change for the<br />

same resource to the repository, then there is no conflict and you can continue<br />

with a commit. But if you have changed a resource and the copy you started with<br />

was also changed by someone else and committed, then you have a true conflict.<br />

To see true conflicts, click the Show only conflicts button on the Structure<br />

Compare toolbar. Conflicts are indicated by a red arrow in the view.<br />

Chapter 15. Development in a team environment 531

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

Saved successfully!

Ooh no, something went wrong!