SVN Conflicts Activity

This lab will require about 15 minutes to complete.
In this activity we'll be using the Sandbox folder from the SVN Training Exercise. 
You must have completed that exercise before you can begin this activity.

This activity is carried out in pairs.  Select a partner and find a lab where you can work at adjacent workstations. The instructions require RapidSVN and Linux. Print one copy of the instructions below and pass it back and forth to the appropriate developer for each step.  You should look at each other's monitor to observe the effect of the commands.

Step
 Developer X
 Developer Y
1
 In the Sandbox folder from the SVN Training create a new file named songXXYY.txt where XX is the first developer's initials and YY is the second developer's initials.
Copy and paste these four lines into the file:
Row, row, row your boat,
Gently down the stream,
Merrily, merrily, merrily, merrily,
Life is but a dream.
Save the file.
2
 Start RapidSVN.
Expand the "Training" bookmark to reveal the Sandbox folder.
Click on the Sandbox folder and the song file appears in the right-hand window. The status should be "unversioned".
3
 Right-click on the song file and choose "Add".

4
 Right-click on the song file and choose "Commit".
Enter an appropriate log message.
5
Start RapidSVN.
Expand the "Training" bookmark to reveal the Sandbox folder.
6
Right-click on the Sandbox folder and choose "Update".
The song file should appear with developer x's name as author.
7
 Edit song file and modify line 1: Change "boat" to "raft"
8
 Right-click on the song file and choose "Update".
Right-click on the song file and choose "Commit".
Enter an appropriate log message.
9
Edit song file and modify line 2: Change "stream" to "river"
10
Right-click on the song file and choose "Update". Since modifications are on different lines there's no conflict and status still says "modified".
11
View the contents of the file to see "boat" has been changed to "raft" in line 1.
12
Right-click on the song file and choose "Commit".
Enter an appropriate log message.
13
 Edit song file and modify line 2: Change  "Gently" to "Swiftly"
14
 Right-click on the song file and choose "Update".
The status says "conflicted" because both changes are to the same line of the file.
15
 If you try to commit the file now, you get an error:
'song.txt' remains in conflict
16
 Edit the file and observe where SVN has flagged the conflict.
Row, row, row your raft,
<<<<<<< .mine
Swiftly down the stream,
=======
Gently down the river,
>>>>>>> .r9
Merrily, merrily, merrily, merrily,
Life is but a dream.

Modify the file, retaining BOTH "Swiftly" and "river" in line 2.  Remove the other comments.
Save the file.
Right-click on the song file and choose "resolve conflicts".
Right-click on the song file and choose "Update".
Right-click on the song file and choose "Commit".
Enter an appropriate log message.
17
Right-click on the song file and choose "Update".
18
View the contents of the file to see the merged contents.
19
Open a terminal window and move to the Sandbox folder.
20
Enter: svn log songXXYY.txt
Observe the Subversion log entries.
21
If you neglected to enter log messages, return to step 1 and perform the entire activity over, and include log messages.
22
Copy-and-paste the log output into a text file and print it.
Alternatively, enter: svn log songXXYY.txt| lpr
to print directly.
23
Write both developers names on the printout and submit it at the start of the next class meeting.