From e57487f108c44cbb196a2324ca22d8617e387fad Mon Sep 17 00:00:00 2001 From: Jonathan Calver Date: Sun, 17 Sep 2023 12:47:41 -0400 Subject: [PATCH 1/9] Alice's version of the recipe added --- recipe.md | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/recipe.md b/recipe.md index a8b51a4d..c43eefce 100644 --- a/recipe.md +++ b/recipe.md @@ -4,9 +4,16 @@ - 2 cups all-purpose flour - 1 3/4 cups granulated sugar - 3/4 cup unsweetened cocoa powder +- 1 cup chocolate chips +- 1 tsp vanilla extract - ... ## Instructions: 1. Preheat the oven to 350°F (175°C). -2. In a large bowl, whisk together the flour, sugar, and cocoa powder. -3. ... \ No newline at end of file +2. In a large bowl, whisk together the flour, sugar, cocoa powder, chocolate chips, and vanilla extract. +3. ... + +## Additional Directions by Alice: +4. In a separate bowl, beat the eggs and add them to the mixture. Stir until well combined. +5. Gradually add the milk and vegetable oil to the mixture, continuing to stir. +6. Pour the batter into a greased and floured 9x13-inch baking pan. From 4bdc01da56526c358b127c074abf1f4b5fefa57e Mon Sep 17 00:00:00 2001 From: vithushon Date: Sat, 23 Sep 2023 18:34:19 -0400 Subject: [PATCH 2/9] First commit --- README.md | 10 +++++----- src/DataTypes.java | 8 ++++++-- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 9e06d2e2..f9096d96 100644 --- a/README.md +++ b/README.md @@ -24,19 +24,19 @@ can make pull requests to that repo during the Task 3 activity during the lab. During lab, you should not fork directly from https://github.com/CSC207-2023F-UofT/Lab2. If you miss the lab and work on this after, you should use this URL though. -- [ ] Make a fork of this repo and clone a local copy (as you did in Lab 1). +- [x] Make a fork of this repo and clone a local copy (as you did in Lab 1). - Important: make sure to uncheck the option to only fork the main branch, as the repo contains some branches you will use in this lab. # TASK 1: Your first branch -- [ ] Create and checkout a new branch called `task_1` using either IntelliJ or the Terminal: +- [x] Create and checkout a new branch called `task_1` using either IntelliJ or the Terminal: - IntelliJ: `Git -> New branch...` - Terminal: `git checkout -b task_1` - After, you can check `git status` or the Log tab of the Git tool window in IntelliJ to see that you are now on the `task_1` branch. -- [ ] Open the TODO tool window (`View -> Tool Windows -> TODO`) and click on the TASK 1 TODO listed. -- [ ] Complete the TASK 1 TODO and commit your changes to this file (checking off the +- [x] Open the TODO tool window (`View -> Tool Windows -> TODO`) and click on the TASK 1 TODO listed. +- [x] Complete the TASK 1 TODO and commit your changes to this file (checking off the completed items so far) and `DataTypes.java` (remove the word TODO and your bug fix). - talk to those around you or your TA, then see the hints at the bottom of the readme if you get stuck. - [ ] Now, we'll merge the `task_1` branch back into `main`. When merging, @@ -127,4 +127,4 @@ When making a pull request, there may potentially be merge conflicts to resolve, previous task. GitHub as additional information about how its interface helps facilitate resolving such conflicts: -https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-on-github \ No newline at end of file +https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-on-github diff --git a/src/DataTypes.java b/src/DataTypes.java index 4f807c1f..970b29e4 100644 --- a/src/DataTypes.java +++ b/src/DataTypes.java @@ -1,14 +1,18 @@ import java.util.List; public class DataTypes { - // TODO TASK 1: fix this code so that it passes the test in DataTypesTest.java public static long sum(List numbers) { - int s = 0; + long s = 0; // below is a "foreach" loop which iterates through numbers for (int x : numbers) { s += x; } return s; } + +public static void main(String[] args) { + + } + } From 2e658e0d61cc32f1a0dc69654790077d86ab4ef3 Mon Sep 17 00:00:00 2001 From: vithushon Date: Sat, 23 Sep 2023 18:36:12 -0400 Subject: [PATCH 3/9] First commit --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index f9096d96..9ece6076 100644 --- a/README.md +++ b/README.md @@ -39,23 +39,23 @@ If you miss the lab and work on this after, you should use this URL though. - [x] Complete the TASK 1 TODO and commit your changes to this file (checking off the completed items so far) and `DataTypes.java` (remove the word TODO and your bug fix). - talk to those around you or your TA, then see the hints at the bottom of the readme if you get stuck. -- [ ] Now, we'll merge the `task_1` branch back into `main`. When merging, +- [x] Now, we'll merge the `task_1` branch back into `main`. When merging, you need to be currently on the branch you are trying to merge into, so we'll first checkout the main branch: - IntelliJ: `Git -> branches... -> main -> Checkout` - Terminal: `git checkout main` Note: everything we've done has been local to our repository and have not pushed anything yet. -- [ ] We are back on `main`, so we can now do the merge and complete our work! +- [x] We are back on `main`, so we can now do the merge and complete our work! - IntelliJ: `Git -> Merge... -> task_1 -> Merge` - Terminal: `git merge task_1` You should now see the changes you had made are also in the `main` branch. -- [ ] Now, we'll want to clean up since we are done with our `task_1` branch. +- [x] Now, we'll want to clean up since we are done with our `task_1` branch. - IntelliJ: `Git -> branches... -> task_1 -> Delete` - Terminal: `git branch -d task_1` -- [ ] Last step, we'll push our changes to the remote repository to share our work! (As we did in Lab 1.) +- [x] Last step, we'll push our changes to the remote repository to share our work! (As we did in Lab 1.) - we suggest you check off this last item, commit that change (just right on main is fine; no need to branch for this little step), then push your code. Check GitHub to ensure you can see your changes. From e3d3610c7357f4b1c8de37dd631b8dbafd79f549 Mon Sep 17 00:00:00 2001 From: vithushon Date: Sat, 23 Sep 2023 18:37:02 -0400 Subject: [PATCH 4/9] Second Commit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9ece6076..11d3d207 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ You should now see the changes you had made are also in the `main` branch. - IntelliJ: `Git -> branches... -> task_1 -> Delete` - Terminal: `git branch -d task_1` -- [x] Last step, we'll push our changes to the remote repository to share our work! (As we did in Lab 1.) +- [xx] Last step, we'll push our changes to the remote repository to share our work! (As we did in Lab 1.) - we suggest you check off this last item, commit that change (just right on main is fine; no need to branch for this little step), then push your code. Check GitHub to ensure you can see your changes. From 41f3dec054c40e6c3647922d37128669f5e19ea8 Mon Sep 17 00:00:00 2001 From: vithushon Date: Sat, 23 Sep 2023 18:37:23 -0400 Subject: [PATCH 5/9] Fixed README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 11d3d207..9ece6076 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ You should now see the changes you had made are also in the `main` branch. - IntelliJ: `Git -> branches... -> task_1 -> Delete` - Terminal: `git branch -d task_1` -- [xx] Last step, we'll push our changes to the remote repository to share our work! (As we did in Lab 1.) +- [x] Last step, we'll push our changes to the remote repository to share our work! (As we did in Lab 1.) - we suggest you check off this last item, commit that change (just right on main is fine; no need to branch for this little step), then push your code. Check GitHub to ensure you can see your changes. From 59ef14022e9aa74874cd083efcb602e58f7cc280 Mon Sep 17 00:00:00 2001 From: vithushon Date: Sat, 23 Sep 2023 19:09:00 -0400 Subject: [PATCH 6/9] Merging alice and bob --- recipe.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe.md b/recipe.md index a8b51a4d..a59dfd82 100644 --- a/recipe.md +++ b/recipe.md @@ -9,4 +9,4 @@ ## Instructions: 1. Preheat the oven to 350°F (175°C). 2. In a large bowl, whisk together the flour, sugar, and cocoa powder. -3. ... \ No newline at end of file +3. ... From 22e8eebe97f807d4fff2cc3ea0d13f1e2dd70db4 Mon Sep 17 00:00:00 2001 From: vithushon Date: Sat, 23 Sep 2023 19:12:01 -0400 Subject: [PATCH 7/9] Merging alice and bob --- recipe.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/recipe.md b/recipe.md index 2bf132a0..8b5af54b 100644 --- a/recipe.md +++ b/recipe.md @@ -10,10 +10,6 @@ ## Instructions: 1. Preheat the oven to 350°F (175°C). -<<<<<<< HEAD -2. In a large bowl, whisk together the flour, sugar, and cocoa powder. -3. ... -======= 2. In a large bowl, whisk together the flour, sugar, cocoa powder, chocolate chips, and vanilla extract. 3. ... @@ -21,4 +17,4 @@ 4. In a separate bowl, beat the eggs and add them to the mixture. Stir until well combined. 5. Gradually add the milk and vegetable oil to the mixture, continuing to stir. 6. Pour the batter into a greased and floured 9x13-inch baking pan. ->>>>>>> alice + From cf90df7fdbfdd9276440254cf890f3831b9c666f Mon Sep 17 00:00:00 2001 From: vithushon Date: Sat, 23 Sep 2023 19:14:05 -0400 Subject: [PATCH 8/9] updated recipe --- recipe.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe.md b/recipe.md index 8b5af54b..02a78e71 100644 --- a/recipe.md +++ b/recipe.md @@ -9,7 +9,7 @@ - ... ## Instructions: -1. Preheat the oven to 350°F (175°C). +1. Preheat the oven to 350°F (175°C) 2. In a large bowl, whisk together the flour, sugar, cocoa powder, chocolate chips, and vanilla extract. 3. ... From ce211e08631f3d6d60ddafad47e092ef68a94b2a Mon Sep 17 00:00:00 2001 From: vithushon Date: Sat, 23 Sep 2023 19:16:15 -0400 Subject: [PATCH 9/9] updated recipe --- README.md | 12 ++++++------ recipe.md | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 9ece6076..65d66934 100644 --- a/README.md +++ b/README.md @@ -76,24 +76,24 @@ started working on the recipe in `recipe.md` together, and then each filled in t what they felt would make the most delicious cake! You'll notice that your repository already has two branches called `alice` and `bob`. -- [ ] Checkout the `alice` branch. -- [ ] Attempt to merge the `bob` branch into the `alice` branch using either IntelliJ or the Terminal. +- [x] Checkout the `alice` branch. +- [x] Attempt to merge the `bob` branch into the `alice` branch using either IntelliJ or the Terminal. - You will be prompted to resolve a merge conflict. To do this, you will need to pick and choose which parts of each recipe to keep. - Read what either `git` or `IntelliJ` tells you in order to complete the merge process. - If you do the merge through the Terminal, you will need to edit `recipe.md` to remove all of the merge conflict symbols which `git` has added to your file. Once done, you will need to `git add` the `recipe.md` file and `git commit` to finish the merge. -- [ ] Once the merge is complete, delete the `bob` branch. +- [x] Once the merge is complete, delete the `bob` branch. -- [ ] Finally, checkout the `main` branch and merge the `alice` branch in (as we did previously). +- [x] Finally, checkout the `main` branch and merge the `alice` branch in (as we did previously). Now, you are almost ready to share your recipe with the remote! # TASK 3 -- [ ] Checkout a new branch called `task_3`. -- [ ] Commit any changes that you want to `recipe.md` to improve the recipe. +- [x] Checkout a new branch called `task_3`. +- [x] Commit any changes that you want to `recipe.md` to improve the recipe. - [ ] While still on the `task_3` branch, push your code to your remote repository on GitHub. - [ ] Go to GitHub and you will see an option to make a pull request to the original repo. Make a pull request and see that it shows up in the original repository that you forked. diff --git a/recipe.md b/recipe.md index 02a78e71..b679562c 100644 --- a/recipe.md +++ b/recipe.md @@ -6,6 +6,7 @@ - 3/4 cup unsweetened cocoa powder - 1 cup chocolate chips - 1 tsp vanilla extract +- BROWN SUGAR - ... ## Instructions: