From 15b7e77e443f2d85b5eb9eeeef3fc356339b195a Mon Sep 17 00:00:00 2001 From: Matthew Chan Date: Wed, 24 Jan 2018 17:13:25 -0500 Subject: [PATCH 1/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 979b989..a1d414a 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ A repository for students to practice using Git/Github Instructions for students: 0. Fork the repository into your own github account. -1. Remove the erroneous commit (you will find it in the history). It was a mistake! It shouldn't appear in history anymore. *Hint: rebase --interactive* +1. Remove the erroneous commit `0dbea28`. It was a mistake! It shouldn't appear in history anymore. *Hint: rebase --interactive* 2. Remove the file `delete.me` from the repo 3. Make a file called `todo.txt`, add some tasks into it, and commit it. 4. Rebase your master branch onto matt-chan-branch-1. From 9584f1c7730f40de6fb5d2fa6a1f8d9ad75ea15e Mon Sep 17 00:00:00 2001 From: Matthew Chan Date: Wed, 24 Jan 2018 17:14:15 -0500 Subject: [PATCH 2/5] Update README.md --- README.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index a1d414a..28d2cd1 100644 --- a/README.md +++ b/README.md @@ -2,12 +2,12 @@ A repository for students to practice using Git/Github Instructions for students: -0. Fork the repository into your own github account. -1. Remove the erroneous commit `0dbea28`. It was a mistake! It shouldn't appear in history anymore. *Hint: rebase --interactive* -2. Remove the file `delete.me` from the repo -3. Make a file called `todo.txt`, add some tasks into it, and commit it. -4. Rebase your master branch onto matt-chan-branch-1. -5. Add more tasks to `todo.txt` and commit those too. -6. Go back to the original `todo.txt` and make a new branch called `planB`. Add some tasks to the file and make a commit. -7. Merge the two branches back together. Fix any merge conflicts. -8. Make a pull request against my master branch. +1. Fork the repository into your own github account. +2. Remove the erroneous commit `0dbea28`. It was a mistake! It shouldn't appear in history anymore. *Hint: rebase --interactive* +3. Remove the file `delete.me` from the repo +4. Make a file called `todo.txt`, add some tasks into it, and commit it. +5. Rebase your master branch onto matt-chan-branch-1. +6. Add more tasks to `todo.txt` and commit those too. +7. Go back to the original `todo.txt` and make a new branch called `planB`. Add some tasks to the file and make a commit. +8. Merge the two branches back together. Fix any merge conflicts. +9. Make a pull request against my master branch. From e68c2d9246380b65333412b689187216aadcc41f Mon Sep 17 00:00:00 2001 From: Matthew Chan Date: Wed, 24 Jan 2018 17:15:12 -0500 Subject: [PATCH 3/5] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 28d2cd1..b3db369 100644 --- a/README.md +++ b/README.md @@ -6,8 +6,8 @@ Instructions for students: 2. Remove the erroneous commit `0dbea28`. It was a mistake! It shouldn't appear in history anymore. *Hint: rebase --interactive* 3. Remove the file `delete.me` from the repo 4. Make a file called `todo.txt`, add some tasks into it, and commit it. -5. Rebase your master branch onto matt-chan-branch-1. +5. Rebase your master branch onto `matt-chan-branch-1`. 6. Add more tasks to `todo.txt` and commit those too. -7. Go back to the original `todo.txt` and make a new branch called `planB`. Add some tasks to the file and make a commit. +7. Go back to the original commit introducing `todo.txt` and make a new branch called `planB`. Add some tasks to the file and make a commit. 8. Merge the two branches back together. Fix any merge conflicts. 9. Make a pull request against my master branch. From 6539cf0a6c2f937decbd6d9094334bac0325db1a Mon Sep 17 00:00:00 2001 From: Jen Date: Thu, 25 Jan 2018 16:00:00 -0500 Subject: [PATCH 4/5] removed erroneous commit, removed delete.me, added todo.txt --- delete.me | 1 - todo.txt | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) delete mode 100644 delete.me create mode 100644 todo.txt diff --git a/delete.me b/delete.me deleted file mode 100644 index 7a4187c..0000000 --- a/delete.me +++ /dev/null @@ -1 +0,0 @@ -Delete this file diff --git a/todo.txt b/todo.txt new file mode 100644 index 0000000..e7e3bd0 --- /dev/null +++ b/todo.txt @@ -0,0 +1,3 @@ +drink tea +listen to music +eat cheese From b1675a8567d514c1424890c291600f60e00f3b08 Mon Sep 17 00:00:00 2001 From: Jen Date: Thu, 25 Jan 2018 16:14:35 -0500 Subject: [PATCH 5/5] made some changes to planB todo list --- todo.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/todo.txt b/todo.txt index e7e3bd0..e0e56c9 100644 --- a/todo.txt +++ b/todo.txt @@ -1,3 +1,5 @@ drink tea listen to music eat cheese + +this is the planB todo list muahaha