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-8 Working with conflicts<br />

If you find that you have a conflict, you can choose to do one of the following:<br />

► You can take the change from the branch (update to it) and discard your local<br />

changes.<br />

This could be the right action to take if you have made unintended changes<br />

locally, or if you realize that the version in the branch is “better” than yours.<br />

Overwriting your local changes should be done with caution since you are in<br />

essence throwing work out.<br />

► You can commit your change, overwriting the copy in the branch.<br />

Note: This should be done only with great caution and, if possible, after<br />

consulting with the other developer(s). In essence you are throwing away<br />

someone else's work. The change you are overwriting may have other<br />

dependencies in the branch.<br />

► You can resolve the conflicts manually and mark the resource in your<br />

workspace as “merged”. You may then later choose to commit this merged<br />

result.<br />

Merging will typically be the preferred option because of the risk of<br />

unintentionally losing work associated with the other two options.<br />

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