AVAJAVA Web Tutorials

(Continued from page 1)

Next, let's take care of Demo2.java. This file exists in the remote CVSW repository but it doesn't exist in our local copy of the project. So, we need to 'Update' our local copy of the project to have this file.

I right-clicked Demo2.java and selected Update. This downloads the Demo2.java file from the CVS repository to our local project.

Demo2.java now exists locally and is the same as the remote file, so Demo2.java disappears from the comparison in the Synchronize view.

Now, the only difference between the local and remote projects is the Demo.java file, which has a conflict since we've changed the file and another developer has changed the file and checked that change into CVS. If we double-click Demo.java, that brings the Demo.java file up in a file difference comparison editor. In this view, we can see that our local copy of the file has a line of code that we've added (line 6 of the local copy of Demo.java). The remote Demo.java has a line of code (line 7 of the remote copy of Demo.java) that the other developer added.

I want to keep my change plus merge the other developer's change into my local copy of Demo.java. So, I select the remote change (line 7 of the remote file) and click the button indicated by the mouse arrow to copy the remote change over to the correct position in my local file.

I clicked the Save button to save the change. In the comparison, we can now see that our local file has our change, plus it has been updated with the change made by the other developer.

Notice that the conflict indicator is still red. We need to inform EclipseSW that we've merged our changes. So, I right-clicked Demo.java and selected Mark as Merged.

(Continued on page 3)