From cd38a21b8e6b40372b7e922e8aaae8d65d6b93bd Mon Sep 17 00:00:00 2001 From: xavierb <194048107+xavierb117@users.noreply.github.com> Date: Tue, 14 Jan 2025 11:19:39 -0800 Subject: [PATCH 1/6] Added Exclamation Points --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 437e760..12b17cd 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # grcsay -An exercise for collaborating with git / GitHub. Please read the directions CAREFULLY! I recommend focusing on the changes to the README before reading the Java code. +An exercise for collaborating with git / GitHub. Please read the directions CAREFULLY!!!!!!!!! I recommend focusing on the changes to the README before reading the Java code. ## Setting up git merging strategy 1. Each partner should run these commands on their own terminal. DO NOT SKIP THIS PART!!! From 52825805d57ff60d90af0567233679eb621948a9 Mon Sep 17 00:00:00 2001 From: Dani-DEV28 <193554832+Dani-DEV28@users.noreply.github.com> Date: Tue, 14 Jan 2025 11:21:28 -0800 Subject: [PATCH 2/6] fix the ! too much --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 12b17cd..ae5c9b6 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # grcsay -An exercise for collaborating with git / GitHub. Please read the directions CAREFULLY!!!!!!!!! I recommend focusing on the changes to the README before reading the Java code. +An exercise for collaborating with git / GitHub. Please read the directions CAREFULLY! <-too many ! I recommend focusing on the changes to the README before reading the Java code. ## Setting up git merging strategy 1. Each partner should run these commands on their own terminal. DO NOT SKIP THIS PART!!! From 38af707bafd50b54f3807976022a78dba4487de7 Mon Sep 17 00:00:00 2001 From: Dani-DEV28 <193554832+Dani-DEV28@users.noreply.github.com> Date: Tue, 14 Jan 2025 11:23:21 -0800 Subject: [PATCH 3/6] I am #28 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ae5c9b6..8f1acbb 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ We will now artificially trigger a merge conflict. When we follow good git pract 1. Have BOTH Partner A and Partner B edit the below line. Each person should make it say something different. ``` - EDIT THIS LINE + Dani is Developer #28 ``` 1. Have BOTH Partner A and Partner B add, commit, and push the changes. You can refer to the above steps for a refresher on how to add/commit/push. One of the partners will get an error saying that their changes can't be pushed. This is OK and expected. Today we are practicing how to resolve this error. 1. Have the error partner pull the other partner's changes: From a27d48d80e08c1392a938a275f83d6dfd3a0c896 Mon Sep 17 00:00:00 2001 From: xavierb <194048107+xavierb117@users.noreply.github.com> Date: Tue, 14 Jan 2025 11:23:28 -0800 Subject: [PATCH 4/6] Added Hello World --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ae5c9b6..d558e71 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ We will now artificially trigger a merge conflict. When we follow good git pract 1. Have BOTH Partner A and Partner B edit the below line. Each person should make it say something different. ``` - EDIT THIS LINE + Hello World! ``` 1. Have BOTH Partner A and Partner B add, commit, and push the changes. You can refer to the above steps for a refresher on how to add/commit/push. One of the partners will get an error saying that their changes can't be pushed. This is OK and expected. Today we are practicing how to resolve this error. 1. Have the error partner pull the other partner's changes: From de0399717ba1a6d0801e5eaa88a6d607ceac4469 Mon Sep 17 00:00:00 2001 From: Dani-DEV28 <193554832+Dani-DEV28@users.noreply.github.com> Date: Tue, 14 Jan 2025 11:36:22 -0800 Subject: [PATCH 5/6] doggo is in --- src/Dog.java | 14 ++++++++++++++ src/SayApp.java | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 src/Dog.java diff --git a/src/Dog.java b/src/Dog.java new file mode 100644 index 0000000..06e6677 --- /dev/null +++ b/src/Dog.java @@ -0,0 +1,14 @@ +class Dog implements Animal{ + @Override + public String getAnimalArt(){ + return " \\ .\n" + + " \\ ..^____/\n" + + " `-. ___ )\n" + + " || ||\n"; + } + + @Override + public String toString(){ + return "dog"; + } +} diff --git a/src/SayApp.java b/src/SayApp.java index 9d3bbf7..4a33a4b 100644 --- a/src/SayApp.java +++ b/src/SayApp.java @@ -76,7 +76,7 @@ public static Animal getAnimalChoice(Scanner scanner) { * @return A list of Animal objects. */ public static List animalList() { - return Arrays.asList(new Cow(), new Duck()); + return Arrays.asList(new Cow(), new Duck(), new Dog()); } /** From 86ea3b48caa1f9b017f945305a1b9ebf9f363043 Mon Sep 17 00:00:00 2001 From: xavierb <194048107+xavierb117@users.noreply.github.com> Date: Tue, 14 Jan 2025 11:38:21 -0800 Subject: [PATCH 6/6] Added Deer --- src/Deer.java | 18 ++++++++++++++++++ src/SayApp.java | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 src/Deer.java diff --git a/src/Deer.java b/src/Deer.java new file mode 100644 index 0000000..62699f9 --- /dev/null +++ b/src/Deer.java @@ -0,0 +1,18 @@ +class Deer implements Animal { + + @Override + public String getAnimalArt() { + return " \\ ( )\n" + +" \\ `--(_ _)--\'\n" + +" \\ Y-Y\n" + +" \\ /@@ \\\n" + +" \\ / \\\n" + +" `--\'. \\ ,\n" + +" | `.__________/)"; + } + + @Override + public String toString() { + return "Deer"; + } +} diff --git a/src/SayApp.java b/src/SayApp.java index 4a33a4b..73e6d00 100644 --- a/src/SayApp.java +++ b/src/SayApp.java @@ -76,7 +76,7 @@ public static Animal getAnimalChoice(Scanner scanner) { * @return A list of Animal objects. */ public static List animalList() { - return Arrays.asList(new Cow(), new Duck(), new Dog()); + return Arrays.asList(new Cow(), new Duck(), new Dog(), new Deer()); } /**