diff --git a/README.md b/README.md index da51942..b3db369 100644 --- a/README.md +++ b/README.md @@ -2,11 +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 (you will find it in the history). 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. Add more tasks to the file and commit those too. -5. Go back to the original `todo.txt` and make a new branch called `planB`. Add some tasks to the file and make a commit. -6. Merge the two branches back together. Fix any merge conflicts. -7. 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 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. 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/dummy.file b/dummy.file new file mode 100644 index 0000000..2b6ffce --- /dev/null +++ b/dummy.file @@ -0,0 +1 @@ +This file exists only in the branch diff --git a/todo.txt b/todo.txt new file mode 100644 index 0000000..2b2770c --- /dev/null +++ b/todo.txt @@ -0,0 +1,8 @@ +Find out if I did the rebase correctly +Work +Sleep +drink water +exercise +read papers +wake up again +work