Changes between Version 1 and Version 2 of SubversionConflictsActivity

Timestamp:

10/21/2019 12:03:20 PM (7 years ago)

Author:

jdalbey

Comment:

ver 1

SubversionConflictsActivity

@@ -7 +7 @@
 
 || Step || Developer X || Developer Y ||
-|| ---- || ------------------------------------------------------------ || ----------------------------------------------------------- ||
-|| 1 || In the SVNtutorial folder use a text editor to create a new file named ''song`XXYY`.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: [[BR]][[BR]]`Row, row, row your boat, Gently down the stream,Merrily, merrily, merrily, merrily,Life is but a dream. `[[BR]][[BR]]Save the file. || ||
+|| || || ||
+|| 1 || In the SVNtutorial folder use a text editor to create a new file named ''song`XXYY`.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: [[BR]][[BR]]`Row, row, row your boat,`[[BR]]`Gently down the stream,`[[BR]]`Merrily, merrily, merrily,merrily,`[[BR]]`Life is but a dream.`[[BR]][[BR]]Save the file. || ||
 || 2 || Use the Subversion status command to verify the file's status is "unversioned". || ||
 || 3 || Use the subversion add command to place the file under subversion control. || ||
@@ -15 +15 @@
 || 6 || || Issue the subversion update command. 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 || Issue the subversion update command. Right-click on the song file and choose "Update".   Commit the file with an appropriate log message. || ||
+|| 8 || Issue the subversion update command. Commit the file with an appropriate log message. || ||
 || 9 || || Edit song file and modify line 2: Change "stream" to "river" ||
 || 10 || || Issue the subversion update command. Since modifications are on different lines there's no conflict and status still says "modified". ||
@@ -21 +21 @@
 || 12 || || Commit the file with an appropriate log message. ||
 || 13 || Edit song file and modify line 2: Change  "Gently" to "Swiftly" || ||
-|| 14 || Issue the subversion update command.   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. || ||
+|| 14 || Issue the subversion update command.   The status indicates "conflicted" because both changes are to the same line of the file. || ||
+|| 15 || Discuss with your partner which version should be retained.  Resolve the conflict using your subversion client (specific details vary). ||
+|| 16 || Repeat the update. (It should succeed this time).    Commit the file with an appropriate log message. || ||
 || 17 || || Issue the subversion update command. ||
-|| 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 || || || || || || ||
+|| 18 || || View the contents of the file to see the updated contents. ||