29.01.2013 Views

WebSphere Application Server - IBM Redbooks

WebSphere Application Server - IBM Redbooks

WebSphere Application Server - IBM Redbooks

SHOW MORE
SHOW LESS

Create successful ePaper yourself

Turn your PDF publications into a flip-book with our unique Google optimized e-Paper software.

Figure 15-11 Marking the new local copy as merged<br />

15.6.3 Updating from the repository<br />

Updating is the act of taking changes committed by others to the branch and<br />

copying to your workspace, replacing your copy.<br />

You can update your workspace with the work that has been done by other team<br />

members and committed to the branch since you last synchronized. To update<br />

workbench resources:<br />

1. Select the resource or project in the navigator view you want to update.<br />

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

3. In the Synchronize view, select the Incoming mode button on the view’s<br />

toolbar. The resources that are different in the respository will be flagged. If<br />

you want to see the actual differences you can double-click the resource and<br />

the two versions will open in the Text Compare area.<br />

4. Click the Show only conflicts icon to see a list of resources that have true<br />

conflicts. If there are no conflicts (no red arrows), you can update the<br />

resources in the workbench without losing any changes you have made.<br />

Chapter 15. Development in a team environment 535

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

Saved successfully!

Ooh no, something went wrong!