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.

Developer 1 (maintenance developer) Developer 2<br />

Merges changes made to the HEAD<br />

branch since the new branch was created<br />

into the workspace<br />

► Select project in Web perspective.<br />

► Team -> Merge.<br />

► Merge start point is Root_BeginMaint.<br />

► Merge changes from BeginMaint<br />

branch.<br />

Uses the Structure Compare and Text<br />

Compare views to update from the<br />

repository and to resolve conflicts<br />

Adds new files picked up during the merge<br />

to version control and commits the newly<br />

merged code to the HEAD branch<br />

Deletes the BeginMaint branch<br />

15.8 Viewing resource history<br />

You can view the history of a resource in the CVS Repositories view from almost<br />

any navigator where you can select a project resource. The history will show you<br />

a list of all revisions, who created the revision, the date and time, revision<br />

comments, and associated tags. Versions will be indicated by the associated<br />

tags.<br />

To see the CVS server history for a resource select Team -> Show in Resource<br />

History from the context menu of the resource in the navigator view. If you are in<br />

the CVS Repository Exploring this is simply Show in Resource History.<br />

542 <strong>IBM</strong> <strong>WebSphere</strong> <strong>Application</strong> <strong>Server</strong> - Express V5.0.2 Developer Handbook<br />

Synchronizes with HEAD to pick up the<br />

fixes

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

Saved successfully!

Ooh no, something went wrong!