Difference between revisions of "Merging"

From Coder Merlin
Line 3: Line 3:


== Experiment ==
== Experiment ==
Note: '''You will need to work with a partner for this lab.'''  (We'll call the partners, ''Partner A'' and ''Partner B''.) '''Only Partner A''' should perform the following steps:
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:
{| class="wikitable"
{| class="wikitable"
| Log on to GitHub
| Log on to GitHub
Line 30: Line 33:
# Click the '''Add collaborator''' button
# Click the '''Add collaborator''' button
| [[File:GitHub-AddCollaborator.png|Collaborators]]
| [[File:GitHub-AddCollaborator.png|Collaborators]]
|-
|}
 
'''Only Partner B''' should perform the following steps:
{| class="wikitable"
| '''Partner B''' will receive a verification email from GitHub.
| '''Partner B''' will receive a verification 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 '''Verify email address''' link.
| [[File:GitHub-VerifyEmailAddress.png|Verify Email Address]]
|}
|}

Revision as of 16:06, 14 April 2019

Within these castle walls be forged Mavens of Computer Science ...
— Merlin, The Coder

Research[edit]

Introduction to Version Control (Emacs)

Experiment[edit]

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

First Steps[edit]

Only Partner A should perform the following steps:

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

Only Partner B should perform the following steps:

Partner B will receive a verification email from GitHub.
  1. Partner B should open the email. If it doesn't appear to arrive within a minute or two check the SPAM/Junk folder.
  2. Partner B should click on the Verify email address link.
Verify Email Address