# start bob
 1030  cd bob

# clone the repository; (Alice has already pushed starting files)
 1037  git clone git@gitlab.cs.washington.edu:bdmyers/talk.git
 1038  cd talk/
 1052  source ../login_as_bob.sh 
 1039  ls

# Demo: Alice and Bob change different parts of the code
 1046  vim speak.c
 1047  git add speak.c
 1048  git commit -m "changed printf speak formatting"
 1049  git push
# Bob pushes first, and it succeeds


# Demo: Alice and Bob change same line
 1056  vim main.c       # edit line 12
 1057  git add main.c 
 1058  git commit -m "changed the message inside of speak"
 1059  git push
# Bob's push is rejected because Alice pushed a new change

# Bob must get the latest changes from the server
 1060  git pull
# MERGE CONFLICT; git doesn't know how to merge two changes to the same line!

# git status shows us the files that are conflicting
 1061  git status

# do the merge manually by editing the file with the conflict
 1062  vim main.c 

# indicate we are finished with fixing the file
 1063  git add main.c

# continue the merge
 1064  git commit

# share the merged version
 1065  git push


 1067  history > bob.history