From 48f7113fcf145c0d17173c0d723d081e7a6e28f5 Mon Sep 17 00:00:00 2001 From: zubyogbu Date: Tue, 19 Sep 2023 21:17:54 -0400 Subject: [PATCH 1/4] finished task 1 --- src/DataTypes.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/DataTypes.java b/src/DataTypes.java index 4f807c1f..7601f4dd 100644 --- a/src/DataTypes.java +++ b/src/DataTypes.java @@ -1,10 +1,9 @@ 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; From 4e2509cc39057bc1c7e30071a0b49ab35412f736 Mon Sep 17 00:00:00 2001 From: zubyogbu Date: Tue, 19 Sep 2023 21:20:44 -0400 Subject: [PATCH 2/4] task 1 finished --- README.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 9e06d2e2..c053b961 100644 --- a/README.md +++ b/README.md @@ -24,38 +24,38 @@ 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, +- [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 4c61b011574971b1401cd92f904bb04ff5d6b604 Mon Sep 17 00:00:00 2001 From: zubyogbu Date: Tue, 19 Sep 2023 21:37:26 -0400 Subject: [PATCH 3/4] idk --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a0417102..7c79851e 100644 --- a/README.md +++ b/README.md @@ -74,7 +74,7 @@ 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. +- [X] Checkout the `alice` branch. - [ ] 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. From cd89a0ddf48df68ab18d73ab1a06432d6843ef46 Mon Sep 17 00:00:00 2001 From: zubyogbu Date: Tue, 19 Sep 2023 21:41:43 -0400 Subject: [PATCH 4/4] boxes checked --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index fb3a1213..0de245f2 100644 --- a/README.md +++ b/README.md @@ -77,16 +77,16 @@ what they felt would make the most delicious cake! You'll notice that your repository already has two branches called `alice` and `bob`. - [X] Checkout the `alice` branch. -- [ ] Attempt to merge the `bob` branch into the `alice` branch using either IntelliJ or the Terminal. +- [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!