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.

Merging changes<br />

The Synchronize view shows those resources that are in conflict with the<br />

repository. For a given resource in conflict, typically you will want to merge your<br />

changes with changes in the branch’s resource.<br />

For example, let us assume that both you and another team member have<br />

modified the same HTML page. Selecting that resource in the Synchronize view<br />

will display a comparison of the local resource and the branch version. By cycling<br />

through and resolving the individual conflicts by manually updating the code, you<br />

can decide for each change whether to accept the incoming change, reject it, or<br />

merge it with your local changes. When you are finished resolving the conflicts,<br />

you save your changes in your workspace. You can subsequently commit this<br />

merged resource.<br />

Figure 15-9 Resolving conflicts<br />

You can resolve conflicts in the Incoming/Outgoing view in the following ways.<br />

► Whole document: In the Structure Compare editor, select the resource that<br />

you want to merge so that the resource is displayed in the Text Compare<br />

editor. In the Text Compare editor, click the Copy all from right to left button<br />

to entirely replace the text in your local editor with the contents of the<br />

repository copy.<br />

Chapter 15. Development in a team environment 533

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

Saved successfully!

Ooh no, something went wrong!