Try Out (cont.)


1.  There is a word "neighbour" missing in chapter 1, line 23


2.  Goto checkout B, in chapter 1, line 32, replace ??? with "neighbour"


3.  Commit your change


4.  Goto checkout A, and replace ??? with "neighbor", the American spelling


5.  The change cannot be committed, since it is not the latest revision of the file


6.  Do an update, it will result in a conflict.


7.  Resolve the conflict and commit.
Slide 16