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.

► Current change: In the Text Compare editor, either use the Select Next<br />

Change and Select Previous Change buttons to navigate to the conflict that<br />

you want to resolve, or simply click in either source pane somewhere in the<br />

desired change difference section. Click the Copy current change from<br />

right to left button when you want to overwrite the highlighted fragment with<br />

the corresponding modification in the repository.<br />

► Manually: If you want to combine the two changes you can use copy and<br />

paste to move data from the repository copy to the local copy.<br />

Note: You will see more on comparing two files in 15.9.4, “Working with the<br />

comparison” on page 547.<br />

When you are done, you can save your local version by selecting Save in the<br />

context menu of the text compare area for the local copy.<br />

This will prompt you to save your changes. If you have updated your working<br />

copy you will be reminded to mark the new file as merged when you are done.<br />

This flags the resource as an outgoing change.<br />

Figure 15-10 Mark as merged<br />

To mark the resource as merged, select it in the Structure Compare area, and<br />

select Mark as Merged in the context menu.<br />

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