Setup Instructions


Figure 1

Notepad++ Screenshot)


Introduction to Git & GitHub


Figure 1

Piled Higher and Deeper by Jorge Cham, http://www.phdcomics.com/comics/archive_print.php?comicid=1531

Figure 2

Changes Are Saved Sequentially
Changes Are Saved Sequentially

Figure 3

Different Versions Can be Saved
Different Versions Can be Saved

Figure 4

Multiple Versions Can be Merged
Multiple Versions Can be Merged

Create a GitHub Repository


Figure 1

Create a new repo from anywhere in GitHub
Create a new repo from anywhere in GitHub

Figure 2

Create the multiverse repo in GitHub
Create the multiverse repo in GitHub

Figure 3

Your new multiverse repo on GitHub
Your new multiverse repo on GitHub

Setup Git Configs


Tracking Changes


Figure 1

Text entered into new notepad++ document
Text entered into new notepad++ document

Figure 2

Select Save as from menu
Select Save as from menu

Figure 3

Save document as earth.txt
Save document as earth.txt

Figure 4

The Git Staging Area
The Git Staging Area

Pushing changes to GitHub


Figure 1

Changes have been pushed
Changes have been pushed

Figure 2

View earth.txt
View earth.txt

Figure 3

View earth.txt commits
View earth.txt commits

Branches


Figure 1

GitHub has the branch heimdall-aware
GitHub has the branch heimdall-aware

Pull Requests


Figure 1

Open a Pull Request on GitHub for branch heimdall-aware
Open a Pull Request on GitHub for branch heimdall-aware

Figure 2

Pull Request is created
Pull Request is created

[Optional] Resolving Conflicts


Figure 1

The Conflicting Changes
The Conflicting Changes

Figure 2

Merge conflict in earth.txt
Merge conflict in earth.txt

Figure 3

Resolving the merge conflict with the merge editor
Resolving the merge conflict with the merge editor

Figure 4

The bottom pane contains the resolved earth.txt contents
The bottom pane contains the resolved earth.txt contents

[Optional] Practice GitHub Skills