From 2d7199434dbc5b29cc6002b8423f722aae859b43 Mon Sep 17 00:00:00 2001 From: Nikole Chetty Date: Fri, 21 Jan 2022 16:26:18 -0500 Subject: [PATCH 1/5] Added Nikole Chetty to roster --- ClassRoster.md | 1 + 1 file changed, 1 insertion(+) diff --git a/ClassRoster.md b/ClassRoster.md index 0769fe6..db68537 100644 --- a/ClassRoster.md +++ b/ClassRoster.md @@ -1,2 +1,3 @@ # Class Roster - Michael Hilton (mhilton) +- Nikole Chetty (nchetty) From d3966be354c85545d5c5395b8fa5b9acae54d49d Mon Sep 17 00:00:00 2001 From: Nikole Chetty Date: Mon, 24 Jan 2022 11:16:01 -0500 Subject: [PATCH 2/5] Created student_facts with school info --- student_facts.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 student_facts.txt diff --git a/student_facts.txt b/student_facts.txt new file mode 100644 index 0000000..589e3f2 --- /dev/null +++ b/student_facts.txt @@ -0,0 +1 @@ +I am a first year in the College of Engineering From 86b967211bc27fc9ae46fa7ef3f21db86acd0b61 Mon Sep 17 00:00:00 2001 From: Nikole Chetty Date: Mon, 24 Jan 2022 11:19:21 -0500 Subject: [PATCH 3/5] Removed school info, added fun fact --- student_facts.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/student_facts.txt b/student_facts.txt index 589e3f2..4727938 100644 --- a/student_facts.txt +++ b/student_facts.txt @@ -1 +1 @@ -I am a first year in the College of Engineering +I go to sleep at 10 pm From e3daa307b57a1534ac1b5c0cebe0ae9765b89dc2 Mon Sep 17 00:00:00 2001 From: Nikole Chetty Date: Mon, 24 Jan 2022 11:23:21 -0500 Subject: [PATCH 4/5] Added prior class info --- student_facts.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/student_facts.txt b/student_facts.txt index 589e3f2..09982f5 100644 --- a/student_facts.txt +++ b/student_facts.txt @@ -1 +1,3 @@ I am a first year in the College of Engineering +I have taken a MATLAB programming classes and various classes where we had to use programing (ex: Machine Learning) + From 7a69d49a9b46c0fdc6493d49ffe24b0f52fd11f6 Mon Sep 17 00:00:00 2001 From: Nikole Chetty Date: Mon, 24 Jan 2022 11:33:29 -0500 Subject: [PATCH 5/5] Added file with terminal commands --- hw1_terminal_commands.txt | 39 +++++++++++++++++++++++++++++++++++++++ student_facts.txt | 4 ---- 2 files changed, 39 insertions(+), 4 deletions(-) create mode 100644 hw1_terminal_commands.txt diff --git a/hw1_terminal_commands.txt b/hw1_terminal_commands.txt new file mode 100644 index 0000000..a7d0363 --- /dev/null +++ b/hw1_terminal_commands.txt @@ -0,0 +1,39 @@ +HW1 Terminal Commands + +git clone https://github.com/cmu-crafting-software/Homework01.git +cd Homework01 +git branch nchetty +git checkout nchetty +ClassRoster.md +git status +git add . +git commit -m "Added Nikole Chetty to roster" +git push origin nchetty + +echo I am a first year in the College of Engineering > student_facts.txt +git status +git add . +git commit -m "Created student_facts with school info" +git branch new_nchetty +git checkout new_nchetty +student_facts.txt +git status +git add . +git status +git commit -m "Removed school info, added fun fact" +git checkout nchetty +student_facts.txt +git status +git add . +git commit -m "Added prior class info" +git status +git merge new_nchetty +student_facts.txt +git status +git add . +git commit -m "Fixed conflict with student_facts for merge" +echo HW1 Terminal Commands > hw1_terminal_commands.txt +hw1_terminal_commands.txt +git status +git add . +git commit -m "Added file with terminal commands" \ No newline at end of file diff --git a/student_facts.txt b/student_facts.txt index 7deaf48..ab526bf 100644 --- a/student_facts.txt +++ b/student_facts.txt @@ -1,7 +1,3 @@ -<<<<<<< HEAD I am a first year in the College of Engineering I have taken a MATLAB programming classes and various classes where we had to use programing (ex: Machine Learning) - -======= I go to sleep at 10 pm ->>>>>>> new_nchetty