Tom Kelliher, CS 245
Oct. 6, 2010
Read Chapter 4. Online essay.
Project discussion.
Product design.
Adding, deleting, copying, and moving files.
Conflicts and merging changes.
The role of the comment.
(Return to Edit step.)
https://phoenix.goucher.edu/svn/[sample,test,cairn]
.
Working in twos or threes:
Create a project, named [Name]Exercise.
Create a class, Colors, in myPackage.
Copy and paste Colors.java code from Practice into the newly-created class.
Share the project.
Checkout the project.
Make a change to the same line of the class file.
Try to update/commit.
Resolve the conflict.