From 2b6cbd162fecfcf0822b2fe6fb5a29022bee3fe0 Mon Sep 17 00:00:00 2001 From: Matthew Chan Date: Wed, 24 Jan 2018 16:43:03 -0500 Subject: [PATCH 1/8] Create dummy.file --- dummy.file | 1 + 1 file changed, 1 insertion(+) create mode 100644 dummy.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 From 8b84c65de17ff4167d4861b6c9241ceb0bc6df6f Mon Sep 17 00:00:00 2001 From: Matthew Chan Date: Wed, 24 Jan 2018 16:48:21 -0500 Subject: [PATCH 2/8] Update README.md --- README.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index da51942..979b989 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,8 @@ Instructions for students: 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. +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. From 8e7d09c06e23b0fe99b4bcef1df9b3c4fa2a47f8 Mon Sep 17 00:00:00 2001 From: Matthew Chan Date: Wed, 24 Jan 2018 17:13:25 -0500 Subject: [PATCH 3/8] 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 3405f9ad73b8fa5fd64754e16ae0204d1842638b Mon Sep 17 00:00:00 2001 From: Matthew Chan Date: Wed, 24 Jan 2018 17:14:15 -0500 Subject: [PATCH 4/8] 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 187875f9839b9128b87a6fa824c435f67da2a7ed Mon Sep 17 00:00:00 2001 From: Matthew Chan Date: Wed, 24 Jan 2018 17:15:12 -0500 Subject: [PATCH 5/8] 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 6a1892a613383f03c113d2b505c75a5e7e3a4398 Mon Sep 17 00:00:00 2001 From: Xiao Date: Mon, 29 Jan 2018 18:38:45 -0600 Subject: [PATCH 6/8] add todo.txt and delete delete.me --- delete.me | 1 - todo.txt | 1 + 2 files changed, 1 insertion(+), 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..a19abfe --- /dev/null +++ b/todo.txt @@ -0,0 +1 @@ +Hola From 84e4dcfaa01a5ce27661c770158e1a22e2a295c1 Mon Sep 17 00:00:00 2001 From: Xiao Date: Mon, 29 Jan 2018 18:41:18 -0600 Subject: [PATCH 7/8] changed todo.txt --- todo.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/todo.txt b/todo.txt index a19abfe..4fb715a 100644 --- a/todo.txt +++ b/todo.txt @@ -1 +1,2 @@ Hola +Como estas From 4885295eeadf139d1cbc05a7fa0813e486ecbf56 Mon Sep 17 00:00:00 2001 From: Xiao Date: Mon, 29 Jan 2018 18:47:30 -0600 Subject: [PATCH 8/8] changed todo.txt --- todo.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/todo.txt b/todo.txt index a19abfe..b4ed451 100644 --- a/todo.txt +++ b/todo.txt @@ -1 +1,2 @@ Hola +bien y tu