Merging

Within these castle walls be forged Mavens of Computer Science ...

— Merlin, The Coder

Research

Introduction to Version Control (Emacs)

Experiment

Note: You will need to work with a partner for this lab. (We'll call the partners, Partner A and Partner B.)

First Steps

Only Partner A should perform the following steps:

Log on to GitHub
Click on New next to "Repositories"
On the next page: Enter "TheStory" as the Repository name Select Private Select Initialize this repository with a README Click on Create repository
At the top of the next page, click on Settings
On the left-hand list, select Collaborators
On the right-hand side: Enter the GitHub user name of Partner B's GitHub account Click the Add collaborator button Enter the GitHub user name of your invigilator Click the Add collaborator button

Only Partner B should perform the following steps:

Partner B will receive an invitation email from GitHub. Partner B should open the email. If it doesn't appear to arrive within a minute or two check the SPAM/Junk folder. Partner B should click on the Accept Invitation link.
If Partner B sees the image on the right he/she should log in to GitHub and then click on the link in the email again.

Both Partners

Both partners should now log on to the server.

Create a project directory:

cd ~/projects
mkdir project-1601
cd project-1601

Important: Do not skip this step! In order to successfully complete the remainder of the lab, it's important that your username and password (credentials) for GitHub are saved for future access. You can accomplish this by following the steps here and then continuing with this project.

Next, both partners should clone the newly created repository. Note that the actual name of the repository will depend on the user name of Partner A. Adjust the URL appropriately by replacing PARTNER_A_USER_NAME with the actual Partner A user name.

 git clone https://github.com/PARTNER_A_USER_NAME/TheStory

Depending on your configuration, you may need to enter your username and password for GitHub. However, after this point, your credentials should be cached and you shouldn't need to enter them again and again.

Now, enter the directory and then pull the contents from the repository.

cd TheStory
git pull