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:
Only Partner B should perform the following steps: