Welcome to week 7 of software training! This week, you'll be completing a series of git
and GitHub exercises to get used to using git
and the terminal. To get started, type your GT username into the Title box above, then click the "Submit new issue" at the bottom of this page! From there, work through the rest of this checklist.
If you need any help, we recommend these online resources:
- https://help.github.com/articles/github-glossary/
- https://try.github.io/levels/1/challenges/1
- https://learngitbranching.js.org/
- https://chris.beams.io/posts/git-commit/
You can, of course, also flag down an instructor if you run into anything.
Replace gburdell3
with your GT username anywhere it appears in this list.
- 1. Star this repository.
- 2. Create a fork of this repository.
- 3. Clone your fork to your computer.
- 4. Set your forked repository as a remote named
origin
. - 5. Set our repository as a remote named
rj
. - 6. Create a branch named your GT username (ex.
gburdell3
). - 7. Use the terminal to create a folder called "Students" in
years/2019
- 8. Use the terminal to create an empty text file named
gburdell3.txt
in theyears/2019/Students
folder. - 9. Stage and commit the file (make sure you leave good commit messages!)
- 10. Create a new branch from
gburdell3
namedgburdell3-add-text
. - 11. Add some ASCII art to your file (no longer than 30 lines, no more than 80 characters per line) on that branch and merge it into the
gburdell3
branch. Use spaces, not tabs, for indentation in your art, as tabs may distort your image in jr. - 12. Create two branches named
b1
andb2
. - 13. Commit a file called
stuff1.txt
inb1
. - 14. Commit a file called
stuff2.txt
inb2
. - 15. Take the changes from
b1
and apply them tob2
. (hint: merge) - 16. In
b2
, delete both files and commit the changes. - 17. Merge
b2
intob1
. - 18. Merge
b1
intogburdell3
(this should not cause a merge conflict). - 19. Send your committed changes to the
gburdell3
branch on your fork - 20. Create a pull request from your fork’s
gburdell3
branch to our master branch and ask one of the instructors in your session to approve it (if you try to merge it you won’t be able to because permissions). In your pull request description, add a line that says "Fixes #xx" where #xx is the number of the issue you created. This will auto-close your issue once your pull request is merged. - 21. After your PR has been approved, delete all local branches except for
master
andgburdell3
.