jetaggart / basic-git

Basic Git, GitHub, and Students

Git, GitHub, and Students is how we collaborate together during class. Exercises, such as this one, are how we submit work for the rest of class.

In this exercise we'll re-inforce several git concepts and learn how to submit work. Work individually on this. If you finish, help other students.

Tech skills learned

• Git
• GitHub

Resources

• Git Documentation
• Pro Git

Tasks

1. Fork this repository.
2. Create a file called hello.txt.
3. Make a commit with this file.
4. Push this change to GitHub.
5. Add the text "hello world" to line 1 in the file hello.txt.
6. Make a commit with this change.
7. Push this change to GitHub.
8. Ask for an instructor to review your work.
9. Redirect the output from git log into a file called git-log.txt. NO TEXT EDITORS!.
10. Commit this file with the contents using git add -p.
11. Push this change to GitHub.
12. Ask for an instructor to review your work.
13. Log into students and create a submission for this exercise.
14. Fork this repository to the other person's account. Clone this code to the other computer.
15. On the original repository add "I hope this makes it!" on line 2 to the hello.txt.
16. On the newly forked repository add "Oh no! What's going to happen?" on line 2 to the hello.txt.
17. Make a commit on the first computer.
18. Make a commit on the second computer.
19. Merge these two changes together so they both end up on both user's GitHub, on lines 1 and 2, respectively.
20. On one of the computers, over-write the old git-log.txt with the new output from git log.
21. Ask for an instructor to review your work

When you're finished, you should BOTH have a repository on GitHub that has two files in, hello.txt and git-log.txt. git-log.txt contains the most recent output from git log and hello.txt looks like:

hello world
I hope this makes it!
Oh no! What's going to happen?

Now that you've finished this, get some paper and show what you just did visually:

1. Draw the git tree
2. Draw the interactions between each pair's computer and github
3. Ask for an instructor to review your work