From 4b8ec54f6bb8c7d8fbaf3d0b7b4ddc28fd12c02f Mon Sep 17 00:00:00 2001 From: "github-classroom[bot]" <66690702+github-classroom[bot]@users.noreply.github.com> Date: Wed, 16 Apr 2025 00:18:42 +0000 Subject: [PATCH 01/22] add deadline --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 1956698..e59182e 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ +[![Review Assignment Due Date](https://classroom.github.com/assets/deadline-readme-button-22041afd0340ce965d47ae6ef1cefeee28c7c493a6346c4f15d667ab976d596c.svg)](https://classroom.github.com/a/0uiMevno) # git-group-tutorial The purpose of this tutorial is to learn and apply git commands needed to collaborate on a team project. From baf44a09cc6f664d4f291e8e3cf07b60b3e0c8d3 Mon Sep 17 00:00:00 2001 From: PatrickWirries Date: Tue, 15 Apr 2025 19:33:46 -0500 Subject: [PATCH 02/22] added my-page-patrick-wirries.html --- my-page-patrick-wirries.html | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 my-page-patrick-wirries.html diff --git a/my-page-patrick-wirries.html b/my-page-patrick-wirries.html new file mode 100644 index 0000000..0651cdc --- /dev/null +++ b/my-page-patrick-wirries.html @@ -0,0 +1,12 @@ + + + + + + Document + + +

This is the page Patrick added

+ Back + + \ No newline at end of file From 178167ad31273c0ebe97c6f6cdcaae6264e8cbe6 Mon Sep 17 00:00:00 2001 From: dlginsburg515 Date: Tue, 15 Apr 2025 19:34:04 -0500 Subject: [PATCH 03/22] adde my-page-davis-ginsburg.html --- my-page-davis-ginsburg.html | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 my-page-davis-ginsburg.html diff --git a/my-page-davis-ginsburg.html b/my-page-davis-ginsburg.html new file mode 100644 index 0000000..d18d16a --- /dev/null +++ b/my-page-davis-ginsburg.html @@ -0,0 +1,12 @@ + + + + + + Document + + +

This is the page Davis added

+ Back + + From ccdb0bfb129a307d3bad7392d46a594f195ab8c5 Mon Sep 17 00:00:00 2001 From: dlginsburg515 Date: Tue, 15 Apr 2025 19:37:51 -0500 Subject: [PATCH 04/22] added my-page-davis-ginsburg.html --- my-page-davis-ginsburg.html | 1 + 1 file changed, 1 insertion(+) diff --git a/my-page-davis-ginsburg.html b/my-page-davis-ginsburg.html index d18d16a..a6a4aca 100644 --- a/my-page-davis-ginsburg.html +++ b/my-page-davis-ginsburg.html @@ -10,3 +10,4 @@

This is the page Davis added

Back +g \ No newline at end of file From 5c96dd3090da284ff87a36a74b805673fe5e5f23 Mon Sep 17 00:00:00 2001 From: dlginsburg515 Date: Tue, 15 Apr 2025 19:42:35 -0500 Subject: [PATCH 05/22] made confict in index.html. --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index ac4fd1a..eb9e53c 100644 --- a/index.html +++ b/index.html @@ -6,6 +6,6 @@ GitHub Group Tutorial - Your New Page + Your New Page From 9a728e359a00878610c3846415a45a0f26e3225a Mon Sep 17 00:00:00 2001 From: dlginsburg515 Date: Tue, 15 Apr 2025 19:44:45 -0500 Subject: [PATCH 06/22] Modified the index anchor tag --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index ac4fd1a..463abf7 100644 --- a/index.html +++ b/index.html @@ -6,6 +6,6 @@ GitHub Group Tutorial - Your New Page + Davis's New Page From 8638dced8560decb9ce3dd9cb8dcc6c6749dba98 Mon Sep 17 00:00:00 2001 From: PatrickWirries Date: Tue, 15 Apr 2025 19:44:54 -0500 Subject: [PATCH 07/22] modified index.html anchor tag --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index ac4fd1a..6c1012a 100644 --- a/index.html +++ b/index.html @@ -6,6 +6,6 @@ GitHub Group Tutorial - Your New Page + Your New Page From 86672e102f251af62bd41f0b9aaf6b7268facd22 Mon Sep 17 00:00:00 2001 From: dlginsburg515 Date: Tue, 15 Apr 2025 19:58:11 -0500 Subject: [PATCH 08/22] added function text file --- function.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 function.txt diff --git a/function.txt b/function.txt new file mode 100644 index 0000000..0ee2efe --- /dev/null +++ b/function.txt @@ -0,0 +1 @@ +“This is a representation of an unfinished function a group member is working on. \ No newline at end of file From 7835eb3785ffcacf6fed445cfb942652ad7a3c5d Mon Sep 17 00:00:00 2001 From: PatrickWirries Date: Tue, 15 Apr 2025 19:58:51 -0500 Subject: [PATCH 09/22] added function text file --- function.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 function.txt diff --git a/function.txt b/function.txt new file mode 100644 index 0000000..51e82d8 --- /dev/null +++ b/function.txt @@ -0,0 +1 @@ +"This is a representation of an unfinished function a group member is working on." \ No newline at end of file From 714dbe4879c275178f77bba6b4d6f8a552a62be3 Mon Sep 17 00:00:00 2001 From: dlginsburg515 Date: Tue, 15 Apr 2025 20:02:16 -0500 Subject: [PATCH 10/22] changed function text --- function.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/function.txt b/function.txt index 0ee2efe..58f316a 100644 --- a/function.txt +++ b/function.txt @@ -1 +1,2 @@ -“This is a representation of an unfinished function a group member is working on. \ No newline at end of file +This is a representation of an unfinished function a group member is working on. +This is a new change from Davis Ginsburg \ No newline at end of file From f47f1b1b236965d897e849e9ab48967ce92840c4 Mon Sep 17 00:00:00 2001 From: PatrickWirries Date: Tue, 15 Apr 2025 20:05:00 -0500 Subject: [PATCH 11/22] Modified function.txt --- function.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/function.txt b/function.txt index 51e82d8..4df47f9 100644 --- a/function.txt +++ b/function.txt @@ -1 +1,2 @@ -"This is a representation of an unfinished function a group member is working on." \ No newline at end of file +"This is a representation of an unfinished function a group member is working on." +"This is a new change from patrick wirries" \ No newline at end of file From dbef3030916262060a308a5e2e43f5d9b70e31d5 Mon Sep 17 00:00:00 2001 From: dlginsburg515 Date: Tue, 15 Apr 2025 20:14:23 -0500 Subject: [PATCH 12/22] updated rb-davis-ginsburg and merged conflicts --- function.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/function.txt b/function.txt index 01b07db..4908876 100644 --- a/function.txt +++ b/function.txt @@ -1,3 +1,5 @@ +This is a representation of an unfinished function a group member is working on. +This is the changes made to this branch while you were working on rb-test "This is a representation of an unfinished function a group member is working on." "This is a new change from patrick wirries" From e2056bf803ca3391701bf02dbd623bbffbba3ebe Mon Sep 17 00:00:00 2001 From: PatrickWirries Date: Tue, 15 Apr 2025 20:15:56 -0500 Subject: [PATCH 13/22] Modified function.txt to merge rb-patrick and rebase --- function.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/function.txt b/function.txt index 01b07db..48d8a04 100644 --- a/function.txt +++ b/function.txt @@ -1,5 +1,7 @@ "This is a representation of an unfinished function a group member is working on." +"This is the changes made to this branch while you were working on rb-test" + "This is a new change from patrick wirries" This is a representation of an unfinished function a group member is working on. From b712b019ef18bce7cb1620e5bea5b580a7c50243 Mon Sep 17 00:00:00 2001 From: dlginsburg515 Date: Tue, 15 Apr 2025 20:19:22 -0500 Subject: [PATCH 14/22] added super important file --- important.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 important.txt diff --git a/important.txt b/important.txt new file mode 100644 index 0000000..e69de29 From a95e4210b8c8a65676e0ea29b7b496f4aac1e4c6 Mon Sep 17 00:00:00 2001 From: PatrickWirries Date: Tue, 15 Apr 2025 20:19:40 -0500 Subject: [PATCH 15/22] Made very important file --- important.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 important.txt diff --git a/important.txt b/important.txt new file mode 100644 index 0000000..e69de29 From 78dc56699ba030c35e04a1b5478ce8341f4f4de4 Mon Sep 17 00:00:00 2001 From: dlginsburg515 Date: Tue, 15 Apr 2025 20:19:56 -0500 Subject: [PATCH 16/22] deleted super important file --- important.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 important.txt diff --git a/important.txt b/important.txt deleted file mode 100644 index e69de29..0000000 From b17c91f5df4c1aa27fb6abc57383fc34685a748b Mon Sep 17 00:00:00 2001 From: PatrickWirries Date: Tue, 15 Apr 2025 20:20:40 -0500 Subject: [PATCH 17/22] Deleted very important file --- important.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 important.txt diff --git a/important.txt b/important.txt deleted file mode 100644 index e69de29..0000000 From e61b8dc416ea28a42e9401a79f6bf0a846081bfe Mon Sep 17 00:00:00 2001 From: dlginsburg515 Date: Tue, 15 Apr 2025 20:22:55 -0500 Subject: [PATCH 18/22] Revert "deleted super important file" This reverts commit 78dc56699ba030c35e04a1b5478ce8341f4f4de4. --- important.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 important.txt diff --git a/important.txt b/important.txt new file mode 100644 index 0000000..e69de29 From 0a7d2f9f04f29a4afb2740c793ce7cc1dc0b27a5 Mon Sep 17 00:00:00 2001 From: PatrickWirries Date: Tue, 15 Apr 2025 20:25:27 -0500 Subject: [PATCH 19/22] Revert "Deleted very important file" This reverts commit b17c91f5df4c1aa27fb6abc57383fc34685a748b. --- important.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 important.txt diff --git a/important.txt b/important.txt new file mode 100644 index 0000000..e69de29 From 7b875891430ae639c5ba86cb7ca37ce4e809e543 Mon Sep 17 00:00:00 2001 From: PatrickWirries Date: Tue, 15 Apr 2025 20:32:45 -0500 Subject: [PATCH 20/22] Fixed 2 link names --- index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index 4e1fcb7..fe7972f 100644 --- a/index.html +++ b/index.html @@ -7,12 +7,12 @@ - Your New Page + Patrick's New Page Davis's New Page - Your New Page + Your New Page (Conflict) From 7944270b32d73a64c830d3c0a01307949e3851df Mon Sep 17 00:00:00 2001 From: nHoedl Date: Fri, 18 Apr 2025 16:07:41 -0500 Subject: [PATCH 21/22] added function text file --- function.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/function.txt b/function.txt index c8358c5..4340268 100644 --- a/function.txt +++ b/function.txt @@ -9,3 +9,5 @@ This is the changes made to this branch while you were working on rb-test This is a representation of an unfinished function a group member is working on. This is a new change from Davis Ginsburg +This is a representation of an unfinished function a group member is working on. +This is a new change from Nicholas Hoedl. \ No newline at end of file From 9fc83291e6c318aa9ab89eef0d5e32905491c227 Mon Sep 17 00:00:00 2001 From: nHoedl Date: Fri, 18 Apr 2025 16:20:01 -0500 Subject: [PATCH 22/22] committed changes from rb-test --- function.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/function.txt b/function.txt index 4340268..90ef941 100644 --- a/function.txt +++ b/function.txt @@ -10,4 +10,6 @@ This is a representation of an unfinished function a group member is working on. This is a new change from Davis Ginsburg This is a representation of an unfinished function a group member is working on. -This is a new change from Nicholas Hoedl. \ No newline at end of file +This is a new change from Nicholas Hoedl. + +This is the changes made to this branch while you were working on rb-test” \ No newline at end of file