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.

15.6 Working with the team using the repository<br />

As the team members update and create resources they will need to synchronize<br />

with the branch periodically. This ensures they have the latest code from other<br />

developers and that conflicts are resolved early in the process. The primary<br />

steps are:<br />

1. Synchronize your workspace copy with the current branch.<br />

2. Resolve conflicts if necessary.<br />

3. Update from the repository (receive changes from the repository).<br />

4. Commit your changes to the repository.<br />

15.6.1 Synchronizing with the repository<br />

The synchronization process will compare the resources in your workspace with<br />

those in the branch and report the differences.<br />

Note: The local history of a resource will be reset every time you synchronize<br />

with the branch.<br />

To synchronize:<br />

1. Select the project that you want to synchronize with the branch from the<br />

Project Navigator view.<br />

2. From the context menu of resource, select Team -> Synchronize with<br />

Repository.<br />

The project in your workspace will be compared to the branch. If there are<br />

differences you will see them in the Synchronize view. There are three modes<br />

in which resources are synchronized in the view:<br />

– Incoming mode: Shows incoming changes only (resources in the steam<br />

that differ from what is in the workbench).<br />

– Outgoing mode: Shows outgoing changes only (resources that have been<br />

modified in the workbench only).<br />

– Incoming/Outgoing mode: Shows both incoming and outgoing changes.<br />

You can switch to any of these three modes by using the view’s toolbar<br />

buttons.<br />

530 <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!