From fe5941c3d446c6202ee02281812e7cf2d89bf8ce Mon Sep 17 00:00:00 2001 From: Anika Harden Date: Sun, 6 Nov 2016 06:10:27 -0500 Subject: [PATCH 1/2] added company etc. --- git_assignment.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/git_assignment.md b/git_assignment.md index b6d701c..60459ce 100644 --- a/git_assignment.md +++ b/git_assignment.md @@ -70,19 +70,19 @@ Let's try it out. You committed your name above, let's see if it really is only - Switch to the master branch. ```git checkout master``` - Reload the file and look for the change you made -What happened to it? +What happened to it? The change isn't on this file. ### Create another branch based off of master Name this branch git-02-[your initials] You've done this before! Look at the earlier notes to see how it's done. ### Commit to the latest branch -On your newest branch, write the company you are representing, if any: [right here] +On your newest branch, write the company you are representing, if any: Kardinal Also, (optionally) check the appropriate boxes as they apply to you or the company you represent: -[ ] Interested in hearing about upcoming Debug Academy classes +[x] Interested in hearing about upcoming Debug Academy classes [ ] Interested in hiring Drupal developers -[ ] Interested in discussing something else with Debug Academy +[x] Interested in discussing something else with Debug Academy Wonderful - more edits have been made, but this time on a different branch (version of the repository.) Stage and commit your changes, as you have done before. From 6a1c68aa85c77ed47f30b07eb91568f45e0f0158 Mon Sep 17 00:00:00 2001 From: Anika Harden Date: Sun, 6 Nov 2016 06:38:36 -0500 Subject: [PATCH 2/2] company name --- git_assignment.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git_assignment.md b/git_assignment.md index 60459ce..5155b44 100644 --- a/git_assignment.md +++ b/git_assignment.md @@ -51,7 +51,7 @@ Simply run the ```git branch``` command and confirm you are where you expect to ### Make your first commit Git is great for keeping the history of all edits on files. Let's try it out by editing the file you're reading right now! -Fill in your name after this colon: [right here] +Fill in your name after this colon: Anika Harden You're not done quite yet. Changes saved to the git history must be deliberate; git does not save every edit you do to the history automatically. Imagine how long the list would be if it did!