From 43ff853aac2409a64cbe37fd281be6570c3e9752 Mon Sep 17 00:00:00 2001 From: Juanzan Date: Tue, 3 Sep 2024 15:52:55 -0500 Subject: [PATCH 01/25] Juan adds his name into README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 341e20b..6d63cf8 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ ## Team members -(Delete this line and replace it with your information!) + Juan Zanguitu ## Git & GitHub From cf57348e4e195580ef1f66a8a5e928c2a11c801f Mon Sep 17 00:00:00 2001 From: dmedinahawk Date: Tue, 3 Sep 2024 15:54:03 -0500 Subject: [PATCH 02/25] editing readme --- README.md | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 341e20b..6052f10 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,8 @@ ## Team members -(Delete this line and replace it with your information!) + +Destiny Medina dmedina8@hawk.iit.edu ## Git & GitHub @@ -38,7 +39,7 @@ Here's an overview of what each team will do: 3. Remaining members will accept the group assignment and join the same team. 4. Each team member will *clone* the repository to their own computer. - + 5. One team member will edit a file in the repository, then *commit* and *push* their changes to GitHub. @@ -65,7 +66,7 @@ you already have a GitHub account, you may use that. ### Step 2 After forming a team of 2-3 students, designate one team member to accept the -assignment using this link: . +assignment using this link: . After selecting their username from the list, use the "Create a new team" option --- feel free to come up with a fun team name, but keep it PG-13. After creating @@ -86,7 +87,7 @@ Note that this assignment writeup can also be viewed on the repository homepage. At this point, only the founding team member will have access to the repository. Each team member should visit to accept the assignment, this time joining the same team created in the previous -step. +step. When this is done, all team members will have access to the same repository hosted on GitHub, which is also shared with the course instructors and TAs. Note @@ -118,7 +119,7 @@ Students already familiar with the command line interface (or up for a challenge) may clone the repository that way. An alternative [Git GUI](https://git-scm.com/downloads/guis) is also an option. If you're not interested in experimenting at this point, though, stick with the GitHub Desktop -application! +application! ### Step 5 @@ -178,7 +179,7 @@ Next, follow the relevant instructions from the previous step to edit "README.md", commit, and push changes to GitHub. At the end of this step, all team members should click "Fetch origin" again to -synchronize their local repositories with GitHub. +synchronize their local repositories with GitHub. Congratulations -- you've all contributed successfully to a team project using Git! Visiting the repository homepage on GitHub should display something like @@ -193,7 +194,7 @@ two steps relies on *branches* and *pull requests*. A branch keeps track of a sequence of commits to our project. Thus far, all commits have been made to the mainline branch (aka "trunk") --- the default name -of this branch is, simply, "main". +of this branch is, simply, "main". At any point, however, we can create a new branch that splits off from the mainline (or some other branch). Working in a secondary branch allows a @@ -222,7 +223,7 @@ Do this by clicking on the "Current branch" button atop the GitHub Desktop application, then clicking "New branch". Each member should create a branch named "dev-USERNAME", replacing USERNAME with their own Hawk ID (e.g., "dev-jdoe"). After doing this, confirm that the current branch is the newly -created one. +created one. Next, each person will add a new Java source file to their local repository. Name the file "Username.java" (replacing "Username" with their own Hawk ID) -- From 86dbf095fad8d27949eb17230c71529df3d1b012 Mon Sep 17 00:00:00 2001 From: LawrenceNolan Date: Tue, 3 Sep 2024 15:59:07 -0500 Subject: [PATCH 03/25] updated name --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 6d63cf8..f55feab 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,7 @@ ## Team members Juan Zanguitu + Nolan Lawrence ## Git & GitHub From 1db80150c909e092a760343d28e6e8112d6e3953 Mon Sep 17 00:00:00 2001 From: dmedinahawk Date: Tue, 3 Sep 2024 16:16:48 -0500 Subject: [PATCH 04/25] editing readme --- README.md | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 341e20b..6052f10 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,8 @@ ## Team members -(Delete this line and replace it with your information!) + +Destiny Medina dmedina8@hawk.iit.edu ## Git & GitHub @@ -38,7 +39,7 @@ Here's an overview of what each team will do: 3. Remaining members will accept the group assignment and join the same team. 4. Each team member will *clone* the repository to their own computer. - + 5. One team member will edit a file in the repository, then *commit* and *push* their changes to GitHub. @@ -65,7 +66,7 @@ you already have a GitHub account, you may use that. ### Step 2 After forming a team of 2-3 students, designate one team member to accept the -assignment using this link: . +assignment using this link: . After selecting their username from the list, use the "Create a new team" option --- feel free to come up with a fun team name, but keep it PG-13. After creating @@ -86,7 +87,7 @@ Note that this assignment writeup can also be viewed on the repository homepage. At this point, only the founding team member will have access to the repository. Each team member should visit to accept the assignment, this time joining the same team created in the previous -step. +step. When this is done, all team members will have access to the same repository hosted on GitHub, which is also shared with the course instructors and TAs. Note @@ -118,7 +119,7 @@ Students already familiar with the command line interface (or up for a challenge) may clone the repository that way. An alternative [Git GUI](https://git-scm.com/downloads/guis) is also an option. If you're not interested in experimenting at this point, though, stick with the GitHub Desktop -application! +application! ### Step 5 @@ -178,7 +179,7 @@ Next, follow the relevant instructions from the previous step to edit "README.md", commit, and push changes to GitHub. At the end of this step, all team members should click "Fetch origin" again to -synchronize their local repositories with GitHub. +synchronize their local repositories with GitHub. Congratulations -- you've all contributed successfully to a team project using Git! Visiting the repository homepage on GitHub should display something like @@ -193,7 +194,7 @@ two steps relies on *branches* and *pull requests*. A branch keeps track of a sequence of commits to our project. Thus far, all commits have been made to the mainline branch (aka "trunk") --- the default name -of this branch is, simply, "main". +of this branch is, simply, "main". At any point, however, we can create a new branch that splits off from the mainline (or some other branch). Working in a secondary branch allows a @@ -222,7 +223,7 @@ Do this by clicking on the "Current branch" button atop the GitHub Desktop application, then clicking "New branch". Each member should create a branch named "dev-USERNAME", replacing USERNAME with their own Hawk ID (e.g., "dev-jdoe"). After doing this, confirm that the current branch is the newly -created one. +created one. Next, each person will add a new Java source file to their local repository. Name the file "Username.java" (replacing "Username" with their own Hawk ID) -- From 8f8a6308be6fab299fa6b26c95f3528f1201d4c8 Mon Sep 17 00:00:00 2001 From: Juanzan Date: Tue, 3 Sep 2024 16:19:28 -0500 Subject: [PATCH 05/25] added name Juan Zanguitu --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6052f10..6d838d9 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ ## Team members - +Juan Zanguitu Destiny Medina dmedina8@hawk.iit.edu ## Git & GitHub From 2a5bda09494d998c998d7b57817e2b8be1a14297 Mon Sep 17 00:00:00 2001 From: LawrenceNolan Date: Tue, 3 Sep 2024 16:27:28 -0500 Subject: [PATCH 06/25] PleaseWork --- README.md | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 6d838d9..fbc821e 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,8 @@ ## Team members Juan Zanguitu -Destiny Medina dmedina8@hawk.iit.edu +Destiny Medina +Nolan Lawrence ## Git & GitHub @@ -39,7 +40,7 @@ Here's an overview of what each team will do: 3. Remaining members will accept the group assignment and join the same team. 4. Each team member will *clone* the repository to their own computer. - + 5. One team member will edit a file in the repository, then *commit* and *push* their changes to GitHub. @@ -66,7 +67,7 @@ you already have a GitHub account, you may use that. ### Step 2 After forming a team of 2-3 students, designate one team member to accept the -assignment using this link: . +assignment using this link: . After selecting their username from the list, use the "Create a new team" option --- feel free to come up with a fun team name, but keep it PG-13. After creating @@ -87,7 +88,7 @@ Note that this assignment writeup can also be viewed on the repository homepage. At this point, only the founding team member will have access to the repository. Each team member should visit to accept the assignment, this time joining the same team created in the previous -step. +step. When this is done, all team members will have access to the same repository hosted on GitHub, which is also shared with the course instructors and TAs. Note @@ -119,7 +120,7 @@ Students already familiar with the command line interface (or up for a challenge) may clone the repository that way. An alternative [Git GUI](https://git-scm.com/downloads/guis) is also an option. If you're not interested in experimenting at this point, though, stick with the GitHub Desktop -application! +application! ### Step 5 @@ -179,7 +180,7 @@ Next, follow the relevant instructions from the previous step to edit "README.md", commit, and push changes to GitHub. At the end of this step, all team members should click "Fetch origin" again to -synchronize their local repositories with GitHub. +synchronize their local repositories with GitHub. Congratulations -- you've all contributed successfully to a team project using Git! Visiting the repository homepage on GitHub should display something like @@ -194,7 +195,7 @@ two steps relies on *branches* and *pull requests*. A branch keeps track of a sequence of commits to our project. Thus far, all commits have been made to the mainline branch (aka "trunk") --- the default name -of this branch is, simply, "main". +of this branch is, simply, "main". At any point, however, we can create a new branch that splits off from the mainline (or some other branch). Working in a secondary branch allows a @@ -223,7 +224,7 @@ Do this by clicking on the "Current branch" button atop the GitHub Desktop application, then clicking "New branch". Each member should create a branch named "dev-USERNAME", replacing USERNAME with their own Hawk ID (e.g., "dev-jdoe"). After doing this, confirm that the current branch is the newly -created one. +created one. Next, each person will add a new Java source file to their local repository. Name the file "Username.java" (replacing "Username" with their own Hawk ID) -- From f48203f1283cc64a57952902860d3c234ca02b39 Mon Sep 17 00:00:00 2001 From: LawrenceNolan Date: Tue, 3 Sep 2024 16:28:35 -0500 Subject: [PATCH 07/25] test --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fbc821e..9a9b5cc 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Juan Zanguitu Destiny Medina -Nolan Lawrence +Nolan Lawrence #hey hows it goin ## Git & GitHub From 9c27ee0f28d59f21ee4f10501b10a9d209a67251 Mon Sep 17 00:00:00 2001 From: Juanzan Date: Tue, 3 Sep 2024 16:29:30 -0500 Subject: [PATCH 08/25] fixed typos --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9a9b5cc..fbc821e 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Juan Zanguitu Destiny Medina -Nolan Lawrence #hey hows it goin +Nolan Lawrence ## Git & GitHub From 8dc19ddd863e858735b3cd37fb9ddc23edf835ce Mon Sep 17 00:00:00 2001 From: dmedinahawk Date: Tue, 3 Sep 2024 16:36:05 -0500 Subject: [PATCH 09/25] Create dmedina8.java first file --- dmedina8.java | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 dmedina8.java diff --git a/dmedina8.java b/dmedina8.java new file mode 100644 index 0000000..256d559 --- /dev/null +++ b/dmedina8.java @@ -0,0 +1,6 @@ +public class cs100 { + public static void main(){ + System.out.println("Hello class"); + } + +} From 8b7f8bd310f05e6c8a8fd09bf6d114bbb40d5edb Mon Sep 17 00:00:00 2001 From: LawrenceNolan Date: Tue, 3 Sep 2024 16:40:00 -0500 Subject: [PATCH 10/25] Create nlawrence1.java java --- nlawrence1.java | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 nlawrence1.java diff --git a/nlawrence1.java b/nlawrence1.java new file mode 100644 index 0000000..83f2034 --- /dev/null +++ b/nlawrence1.java @@ -0,0 +1,5 @@ +public class cs100 { + public static void main(){ + System.out.print("Hello class"); + } +} From 8ce32006cf17dc4a328c9a6dbd41b81933f1f3dc Mon Sep 17 00:00:00 2001 From: Juanzan Date: Tue, 3 Sep 2024 16:42:30 -0500 Subject: [PATCH 11/25] deleted java file --- nlawrence1.java | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 nlawrence1.java diff --git a/nlawrence1.java b/nlawrence1.java deleted file mode 100644 index 83f2034..0000000 --- a/nlawrence1.java +++ /dev/null @@ -1,5 +0,0 @@ -public class cs100 { - public static void main(){ - System.out.print("Hello class"); - } -} From 0a168f5836d5a6c807dece5884e596ed3e1e5081 Mon Sep 17 00:00:00 2001 From: Juanzan Date: Tue, 3 Sep 2024 17:08:13 -0500 Subject: [PATCH 12/25] created java file --- jzanguitu.java | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 jzanguitu.java diff --git a/jzanguitu.java b/jzanguitu.java new file mode 100644 index 0000000..420497d --- /dev/null +++ b/jzanguitu.java @@ -0,0 +1,5 @@ +public class jzanguitu { + public static void main(String[] args) { + System.out.println("Hello class"); + } +} From fe55e2af38ef45ed8ef110177d6223ae9c9912d3 Mon Sep 17 00:00:00 2001 From: dmedinahawk Date: Tue, 3 Sep 2024 23:49:03 -0500 Subject: [PATCH 13/25] deleted dev-medina branch and made a new branch dev-medina --- dmedina8.java | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 dmedina8.java diff --git a/dmedina8.java b/dmedina8.java new file mode 100644 index 0000000..e69de29 From 797fc8f89fb7eebb87d7aaee39eca7a9abe23790 Mon Sep 17 00:00:00 2001 From: Juanzan Date: Wed, 4 Sep 2024 00:02:53 -0500 Subject: [PATCH 14/25] test --- clear | 115 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) create mode 100644 clear diff --git a/clear b/clear new file mode 100644 index 0000000..5a6de6c --- /dev/null +++ b/clear @@ -0,0 +1,115 @@ +commit 41875ce14a8eb5c5df3aeaa03067958d1a9da141 (HEAD -> dev-medina, origin/dev-medina) +Merge: 8dc19dd fe55e2a +Author: Juanzan +Date: Tue Sep 3 23:56:45 2024 -0500 + + Merge branch 'dev-medina' of https://github.com/juanzandev/syntax-society into dev-medina + +commit fe55e2af38ef45ed8ef110177d6223ae9c9912d3 +Author: dmedinahawk +Date: Tue Sep 3 23:49:03 2024 -0500 + + deleted dev-medina branch and made a new branch dev-medina + +commit 8ce32006cf17dc4a328c9a6dbd41b81933f1f3dc (origin/main, origin/HEAD, main) +Author: Juanzan +Date: Tue Sep 3 16:42:30 2024 -0500 + + deleted java file + +commit 8b7f8bd310f05e6c8a8fd09bf6d114bbb40d5edb +Author: LawrenceNolan +Date: Tue Sep 3 16:40:00 2024 -0500 + + Create nlawrence1.java + + java + +commit 8dc19ddd863e858735b3cd37fb9ddc23edf835ce +Author: dmedinahawk +Date: Tue Sep 3 16:36:05 2024 -0500 + + Create dmedina8.java + + first file + +commit 9c27ee0f28d59f21ee4f10501b10a9d209a67251 +Author: Juanzan +Date: Tue Sep 3 16:29:30 2024 -0500 + + fixed typos + +commit f48203f1283cc64a57952902860d3c234ca02b39 +Author: LawrenceNolan +Date: Tue Sep 3 16:28:35 2024 -0500 + + test + +commit 2a5bda09494d998c998d7b57817e2b8be1a14297 +Author: LawrenceNolan +Date: Tue Sep 3 16:27:28 2024 -0500 + + PleaseWork + +commit df51146a0d8df37af5a3b7f2a6d8248af4ccd25f +Merge: 8f8a630 cea35c0 +Author: Juanzan +Date: Tue Sep 3 16:19:57 2024 -0500 + + Merge branch 'main' of https://github.com/juanzandev/syntax-society + +commit 8f8a6308be6fab299fa6b26c95f3528f1201d4c8 +Author: Juanzan +Date: Tue Sep 3 16:19:28 2024 -0500 + + added name Juan Zanguitu + +commit cea35c0198bbbc92200a81522d1b9571309fc0d2 +Merge: 1db8015 b37637b +Author: dmedinahawk +Date: Tue Sep 3 16:16:58 2024 -0500 + + Merge branch 'main' of https://github.com/juanzandev/syntax-society + +commit 1db80150c909e092a760343d28e6e8112d6e3953 +Author: dmedinahawk +Date: Tue Sep 3 16:16:48 2024 -0500 + + editing readme + +commit b37637b847fff67527e077c2ea28d460695764f6 +Merge: cf57348 86dbf09 +Author: dmedinahawk +Date: Tue Sep 3 16:05:47 2024 -0500 + + Merge branch 'main' of https://github.com/juanzandev/syntax-society + +commit 86dbf095fad8d27949eb17230c71529df3d1b012 +Author: LawrenceNolan +Date: Tue Sep 3 15:59:07 2024 -0500 + + updated name + +commit cf57348e4e195580ef1f66a8a5e928c2a11c801f +Author: dmedinahawk +Date: Tue Sep 3 15:54:03 2024 -0500 + + editing readme + +commit 43ff853aac2409a64cbe37fd281be6570c3e9752 +Author: Juanzan +Date: Tue Sep 3 15:52:55 2024 -0500 + + Juan adds his name into README.md + +commit f9a8212596a517aa310cbf5ba71454ec1f9854c1 (upstream/main, upstream/HEAD) +Author: Michael Lee +Date: Tue Sep 3 00:05:36 2024 -0500 + + Update README.md + +commit 7988d54127bc3203586545ea26ba2f2de7186098 +Author: Michael Lee +Date: Sun Sep 11 14:15:46 2022 -0500 + + Initial commit From 4a9d43d3a1cbae9aa139e9e772a03fda6c38ab18 Mon Sep 17 00:00:00 2001 From: Juanzan Date: Wed, 4 Sep 2024 00:03:57 -0500 Subject: [PATCH 15/25] test --- dmedina8.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dmedina8.java b/dmedina8.java index e69de29..e8127fb 100644 --- a/dmedina8.java +++ b/dmedina8.java @@ -0,0 +1,6 @@ +public class dmedina8 { + public static void main(String[] args) { + System.out.println("Hello class"); + } + +} \ No newline at end of file From 42679d762979072de62ef7ae7b8effb8c11b0280 Mon Sep 17 00:00:00 2001 From: Juanzan Date: Wed, 4 Sep 2024 00:05:41 -0500 Subject: [PATCH 16/25] test --- dmedina8.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dmedina8.java b/dmedina8.java index e69de29..e8127fb 100644 --- a/dmedina8.java +++ b/dmedina8.java @@ -0,0 +1,6 @@ +public class dmedina8 { + public static void main(String[] args) { + System.out.println("Hello class"); + } + +} \ No newline at end of file From fbd37f19ed2c5418bab8772c5018e3de8229d0fd Mon Sep 17 00:00:00 2001 From: Juanzan Date: Wed, 4 Sep 2024 00:07:19 -0500 Subject: [PATCH 17/25] test --- clear | 115 ---------------------------------------------------------- 1 file changed, 115 deletions(-) delete mode 100644 clear diff --git a/clear b/clear deleted file mode 100644 index 5a6de6c..0000000 --- a/clear +++ /dev/null @@ -1,115 +0,0 @@ -commit 41875ce14a8eb5c5df3aeaa03067958d1a9da141 (HEAD -> dev-medina, origin/dev-medina) -Merge: 8dc19dd fe55e2a -Author: Juanzan -Date: Tue Sep 3 23:56:45 2024 -0500 - - Merge branch 'dev-medina' of https://github.com/juanzandev/syntax-society into dev-medina - -commit fe55e2af38ef45ed8ef110177d6223ae9c9912d3 -Author: dmedinahawk -Date: Tue Sep 3 23:49:03 2024 -0500 - - deleted dev-medina branch and made a new branch dev-medina - -commit 8ce32006cf17dc4a328c9a6dbd41b81933f1f3dc (origin/main, origin/HEAD, main) -Author: Juanzan -Date: Tue Sep 3 16:42:30 2024 -0500 - - deleted java file - -commit 8b7f8bd310f05e6c8a8fd09bf6d114bbb40d5edb -Author: LawrenceNolan -Date: Tue Sep 3 16:40:00 2024 -0500 - - Create nlawrence1.java - - java - -commit 8dc19ddd863e858735b3cd37fb9ddc23edf835ce -Author: dmedinahawk -Date: Tue Sep 3 16:36:05 2024 -0500 - - Create dmedina8.java - - first file - -commit 9c27ee0f28d59f21ee4f10501b10a9d209a67251 -Author: Juanzan -Date: Tue Sep 3 16:29:30 2024 -0500 - - fixed typos - -commit f48203f1283cc64a57952902860d3c234ca02b39 -Author: LawrenceNolan -Date: Tue Sep 3 16:28:35 2024 -0500 - - test - -commit 2a5bda09494d998c998d7b57817e2b8be1a14297 -Author: LawrenceNolan -Date: Tue Sep 3 16:27:28 2024 -0500 - - PleaseWork - -commit df51146a0d8df37af5a3b7f2a6d8248af4ccd25f -Merge: 8f8a630 cea35c0 -Author: Juanzan -Date: Tue Sep 3 16:19:57 2024 -0500 - - Merge branch 'main' of https://github.com/juanzandev/syntax-society - -commit 8f8a6308be6fab299fa6b26c95f3528f1201d4c8 -Author: Juanzan -Date: Tue Sep 3 16:19:28 2024 -0500 - - added name Juan Zanguitu - -commit cea35c0198bbbc92200a81522d1b9571309fc0d2 -Merge: 1db8015 b37637b -Author: dmedinahawk -Date: Tue Sep 3 16:16:58 2024 -0500 - - Merge branch 'main' of https://github.com/juanzandev/syntax-society - -commit 1db80150c909e092a760343d28e6e8112d6e3953 -Author: dmedinahawk -Date: Tue Sep 3 16:16:48 2024 -0500 - - editing readme - -commit b37637b847fff67527e077c2ea28d460695764f6 -Merge: cf57348 86dbf09 -Author: dmedinahawk -Date: Tue Sep 3 16:05:47 2024 -0500 - - Merge branch 'main' of https://github.com/juanzandev/syntax-society - -commit 86dbf095fad8d27949eb17230c71529df3d1b012 -Author: LawrenceNolan -Date: Tue Sep 3 15:59:07 2024 -0500 - - updated name - -commit cf57348e4e195580ef1f66a8a5e928c2a11c801f -Author: dmedinahawk -Date: Tue Sep 3 15:54:03 2024 -0500 - - editing readme - -commit 43ff853aac2409a64cbe37fd281be6570c3e9752 -Author: Juanzan -Date: Tue Sep 3 15:52:55 2024 -0500 - - Juan adds his name into README.md - -commit f9a8212596a517aa310cbf5ba71454ec1f9854c1 (upstream/main, upstream/HEAD) -Author: Michael Lee -Date: Tue Sep 3 00:05:36 2024 -0500 - - Update README.md - -commit 7988d54127bc3203586545ea26ba2f2de7186098 -Author: Michael Lee -Date: Sun Sep 11 14:15:46 2022 -0500 - - Initial commit From a65de716d1a9e53fc1cbf1d4f6a848cbac3b34db Mon Sep 17 00:00:00 2001 From: Juanzan Date: Wed, 4 Sep 2024 00:14:01 -0500 Subject: [PATCH 18/25] test --- README.md | 5 +++-- dmedina8.java | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 6052f10..79f7557 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,9 @@ ## Team members - -Destiny Medina dmedina8@hawk.iit.edu +Juan Zanguitu +Destiny Medina +Nolan Lawrence ## Git & GitHub diff --git a/dmedina8.java b/dmedina8.java index 256d559..6331d68 100644 --- a/dmedina8.java +++ b/dmedina8.java @@ -1,6 +1,6 @@ -public class cs100 { - public static void main(){ - System.out.println("Hello class"); +public class dmedina8 { + public static void main() { + System.out.println("Hello class"); } } From 218e6cc0bb479ed76d751d8c3e4b469b01df56d5 Mon Sep 17 00:00:00 2001 From: Juanzan Date: Wed, 4 Sep 2024 00:24:49 -0500 Subject: [PATCH 19/25] fixed code and added String[] args inside main() --- dmedina8.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dmedina8.java b/dmedina8.java index 451df1b..68e5854 100644 --- a/dmedina8.java +++ b/dmedina8.java @@ -1,5 +1,5 @@ public class dmedina8 { - public static void main() { + public static void main(String[] args) { System.out.println("Hello class"); } From 697e578e1b105e7121671aea1a17104eb08c2276 Mon Sep 17 00:00:00 2001 From: LawrenceNolan Date: Wed, 4 Sep 2024 15:21:35 -0500 Subject: [PATCH 20/25] java again --- nlawrence.java | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 nlawrence.java diff --git a/nlawrence.java b/nlawrence.java new file mode 100644 index 0000000..72c440f --- /dev/null +++ b/nlawrence.java @@ -0,0 +1,5 @@ +public class nlawrence { + public static void(String[] args) { + System.out.println("Yuh"); + } +} From 432b2360d9a83b5bc8e1bb2e799076bd8024bb10 Mon Sep 17 00:00:00 2001 From: Juanzan Date: Wed, 4 Sep 2024 15:50:18 -0500 Subject: [PATCH 21/25] fixed issue with file --- nlawrence.java | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 nlawrence.java diff --git a/nlawrence.java b/nlawrence.java deleted file mode 100644 index 72c440f..0000000 --- a/nlawrence.java +++ /dev/null @@ -1,5 +0,0 @@ -public class nlawrence { - public static void(String[] args) { - System.out.println("Yuh"); - } -} From 87e04ab00ae995e0239afcc81af517149d72ea03 Mon Sep 17 00:00:00 2001 From: Juanzan Date: Wed, 4 Sep 2024 15:53:44 -0500 Subject: [PATCH 22/25] changed name of java file to nlawrence --- dmedina8.java => nlawrence.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename dmedina8.java => nlawrence.java (77%) diff --git a/dmedina8.java b/nlawrence.java similarity index 77% rename from dmedina8.java rename to nlawrence.java index 68e5854..837f03f 100644 --- a/dmedina8.java +++ b/nlawrence.java @@ -1,4 +1,4 @@ -public class dmedina8 { +public class nlawrence { public static void main(String[] args) { System.out.println("Hello class"); } From d6a9fc87860aa7cc2a6210fad0e1459553792a5c Mon Sep 17 00:00:00 2001 From: dmedinahawk Date: Mon, 9 Sep 2024 19:04:44 -0500 Subject: [PATCH 23/25] merging friends --- dmedina8 | 7 +++++++ jzanguitu.java | 5 ----- nlawrence.java | 6 ------ 3 files changed, 7 insertions(+), 11 deletions(-) create mode 100644 dmedina8 delete mode 100644 jzanguitu.java delete mode 100644 nlawrence.java diff --git a/dmedina8 b/dmedina8 new file mode 100644 index 0000000..5c22f24 --- /dev/null +++ b/dmedina8 @@ -0,0 +1,7 @@ +public class dmedina8 { + public static void main(){ + System.out.println("Hello class"); + } + + } + \ No newline at end of file diff --git a/jzanguitu.java b/jzanguitu.java deleted file mode 100644 index 420497d..0000000 --- a/jzanguitu.java +++ /dev/null @@ -1,5 +0,0 @@ -public class jzanguitu { - public static void main(String[] args) { - System.out.println("Hello class"); - } -} diff --git a/nlawrence.java b/nlawrence.java deleted file mode 100644 index 837f03f..0000000 --- a/nlawrence.java +++ /dev/null @@ -1,6 +0,0 @@ -public class nlawrence { - public static void main(String[] args) { - System.out.println("Hello class"); - } - -} \ No newline at end of file From b64c5e6a92d3189fd1cbb87133f1962c24fb5531 Mon Sep 17 00:00:00 2001 From: Juanzan Date: Mon, 9 Sep 2024 19:23:15 -0500 Subject: [PATCH 24/25] changed file to enable pull request --- jzanguitu.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jzanguitu.java b/jzanguitu.java index 420497d..c5be4b2 100644 --- a/jzanguitu.java +++ b/jzanguitu.java @@ -1,5 +1,5 @@ public class jzanguitu { public static void main(String[] args) { - System.out.println("Hello class"); + System.out.println("Hello classs"); } } From 6630b65a539b8ba29a4b5983e83cc1a75bb11e65 Mon Sep 17 00:00:00 2001 From: Juanzan Date: Mon, 9 Sep 2024 19:33:57 -0500 Subject: [PATCH 25/25] synced with main --- dmedina8 | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 dmedina8 diff --git a/dmedina8 b/dmedina8 new file mode 100644 index 0000000..5c22f24 --- /dev/null +++ b/dmedina8 @@ -0,0 +1,7 @@ +public class dmedina8 { + public static void main(){ + System.out.println("Hello class"); + } + + } + \ No newline at end of file