Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ClassRoster.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
# Class Roster
- Michael Hilton (mhilton)
- Nikole Chetty (nchetty)
39 changes: 39 additions & 0 deletions hw1_terminal_commands.txt
Original file line number Diff line number Diff line change
@@ -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"
3 changes: 3 additions & 0 deletions student_facts.txt
Original file line number Diff line number Diff line change
@@ -0,0 +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)
I go to sleep at 10 pm