From 7e69b7835b6fd60898c46ae9dff4a05c4ea03596 Mon Sep 17 00:00:00 2001 From: "github-classroom[bot]" <66690702+github-classroom[bot]@users.noreply.github.com> Date: Fri, 11 Apr 2025 13:59:13 +0000 Subject: [PATCH 01/30] 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 ecf7dd68e4845f018936de7e7dd4e9b5051fc16b Mon Sep 17 00:00:00 2001 From: brettblomquist Date: Fri, 11 Apr 2025 09:20:09 -0500 Subject: [PATCH 02/30] added my-page-brett-blomquist.html --- my-page-brett-blomquist.html | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 my-page-brett-blomquist.html diff --git a/my-page-brett-blomquist.html b/my-page-brett-blomquist.html new file mode 100644 index 0000000..70ff673 --- /dev/null +++ b/my-page-brett-blomquist.html @@ -0,0 +1,12 @@ + + + + + +Document + + +

This is the page Brett added

+Back + + \ No newline at end of file From 8b52a95b435b06c32fdcf74bc42e6b6ba978f15d Mon Sep 17 00:00:00 2001 From: Elaina-Haugen Date: Fri, 11 Apr 2025 09:23:13 -0500 Subject: [PATCH 03/30] added my-page-elaina-haugen --- my-page-elaina-haugen.html | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 my-page-elaina-haugen.html diff --git a/my-page-elaina-haugen.html b/my-page-elaina-haugen.html new file mode 100644 index 0000000..ed8a54b --- /dev/null +++ b/my-page-elaina-haugen.html @@ -0,0 +1,15 @@ + + + + + + + Document + + + +

This is the page Elaina added

+ Back + + + \ No newline at end of file From ec40984bd418c4550b8f2b9836cd73de21738095 Mon Sep 17 00:00:00 2001 From: brettblomquist Date: Fri, 11 Apr 2025 09:27:05 -0500 Subject: [PATCH 04/30] made conflict 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 53218ca937443f7339594bbffdea1dc9b6c59e91 Mon Sep 17 00:00:00 2001 From: brettblomquist Date: Fri, 11 Apr 2025 09:28:43 -0500 Subject: [PATCH 05/30] 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..b74cd37 100644 --- a/index.html +++ b/index.html @@ -6,6 +6,6 @@ GitHub Group Tutorial - Your New Page + Your New Page From a5784360bd40b7a0e89a10aa939fa229103dcc26 Mon Sep 17 00:00:00 2001 From: brettblomquist Date: Fri, 11 Apr 2025 09:30:24 -0500 Subject: [PATCH 06/30] Modified the index anchor tag --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index b74cd37..7ee5012 100644 --- a/index.html +++ b/index.html @@ -6,6 +6,6 @@ GitHub Group Tutorial - Your New Page + Your New Page From 58898a89883724046d6b751c5a907ebf7120f120 Mon Sep 17 00:00:00 2001 From: Elaina-Haugen Date: Fri, 11 Apr 2025 09:35:36 -0500 Subject: [PATCH 07/30] anchor tag --- index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index ac4fd1a..1d7bf29 100644 --- a/index.html +++ b/index.html @@ -6,6 +6,6 @@ GitHub Group Tutorial - Your New Page + First's Page - + \ No newline at end of file From 52e7cacc54e3b7fbe81e1ac1e5f1587a07a83248 Mon Sep 17 00:00:00 2001 From: shuang1219 Date: Fri, 11 Apr 2025 09:38:13 -0500 Subject: [PATCH 08/30] linked my page to index.html --- my-page-shuang-wu.html | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 my-page-shuang-wu.html diff --git a/my-page-shuang-wu.html b/my-page-shuang-wu.html new file mode 100644 index 0000000..a7cf817 --- /dev/null +++ b/my-page-shuang-wu.html @@ -0,0 +1,12 @@ + + + + + + Document + + +

This is the page Shuang Wu added

+ Back + + From f93d9d4e85e0f279e74c0afc4ecdc99aa123b0b4 Mon Sep 17 00:00:00 2001 From: shuang1219 Date: Fri, 11 Apr 2025 09:39:43 -0500 Subject: [PATCH 09/30] Modified the index anchor tag --- my-page-shuang-wu.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/my-page-shuang-wu.html b/my-page-shuang-wu.html index a7cf817..1bdfbbe 100644 --- a/my-page-shuang-wu.html +++ b/my-page-shuang-wu.html @@ -3,10 +3,10 @@ - Document + Main Index -

This is the page Shuang Wu added

- Back +

Welcome

+ Shuang's Page From e796ba06e61f63167dd612114884818ec7be0d6a Mon Sep 17 00:00:00 2001 From: shuang1219 Date: Fri, 11 Apr 2025 09:44:05 -0500 Subject: [PATCH 10/30] linked to my page --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index ac4fd1a..7731e4c 100644 --- a/index.html +++ b/index.html @@ -6,6 +6,6 @@ GitHub Group Tutorial - Your New Page + Shuang's Page From 96a0910ce32057fbe626c8f945ba5487e68ada8f Mon Sep 17 00:00:00 2001 From: Brett Blomquist <152658160+brettblomquist@users.noreply.github.com> Date: Fri, 11 Apr 2025 09:45:03 -0500 Subject: [PATCH 11/30] Update index.html --- index.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index 1d7bf29..3a8121b 100644 --- a/index.html +++ b/index.html @@ -7,5 +7,6 @@ First's Page + First's Page - \ No newline at end of file + From 32eafc993cce14a5d23fc455201151871b7d3a86 Mon Sep 17 00:00:00 2001 From: shuang1219 Date: Tue, 15 Apr 2025 23:22:23 -0500 Subject: [PATCH 12/30] add shuang-wu page and updated index.html --- index.html | 2 ++ my-page-shuang-wu.html | 12 ++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 my-page-shuang-wu.html diff --git a/index.html b/index.html index 3a8121b..4692d39 100644 --- a/index.html +++ b/index.html @@ -8,5 +8,7 @@ First's Page First's Page + Shuang's Page + diff --git a/my-page-shuang-wu.html b/my-page-shuang-wu.html new file mode 100644 index 0000000..d7f196a --- /dev/null +++ b/my-page-shuang-wu.html @@ -0,0 +1,12 @@ + + + + + +Document + + +

This is the page Shuang added

+Back + + \ No newline at end of file From 5f731da18efd13c842c3c7aba09ab795da7c2c81 Mon Sep 17 00:00:00 2001 From: brettblomquist Date: Wed, 16 Apr 2025 09:06:40 -0500 Subject: [PATCH 13/30] 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..a75c922 --- /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 ad3dbe898cb1e94a6b3985ecf99cff009f554dbe Mon Sep 17 00:00:00 2001 From: brettblomquist Date: Wed, 16 Apr 2025 09:11:47 -0500 Subject: [PATCH 14/30] Added new line to function --- function.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/function.txt b/function.txt index a75c922..c789d88 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 line from Brett Blomquist. \ No newline at end of file From 09dc552edc513e8dd424808649b9bc758d67333f Mon Sep 17 00:00:00 2001 From: Brett Blomquist <152658160+brettblomquist@users.noreply.github.com> Date: Wed, 16 Apr 2025 09:26:45 -0500 Subject: [PATCH 15/30] Revert "Rb test brett blomquist" --- function.txt | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 function.txt diff --git a/function.txt b/function.txt deleted file mode 100644 index c789d88..0000000 --- a/function.txt +++ /dev/null @@ -1,2 +0,0 @@ -This is a representation of an unfinished function a group member is working on. -This is a new line from Brett Blomquist. \ No newline at end of file From 57c2d1fcf745d548621e0b90e67ddcdcd9fa02fb Mon Sep 17 00:00:00 2001 From: Brett Blomquist <152658160+brettblomquist@users.noreply.github.com> Date: Wed, 16 Apr 2025 09:29:06 -0500 Subject: [PATCH 16/30] Revert "Revert "Rb test brett blomquist"" --- function.txt | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 function.txt diff --git a/function.txt b/function.txt new file mode 100644 index 0000000..c789d88 --- /dev/null +++ b/function.txt @@ -0,0 +1,2 @@ +This is a representation of an unfinished function a group member is working on. +This is a new line from Brett Blomquist. \ No newline at end of file From afa837b0a7bd3be1b4f5bb6a2e7bf4e9eebbb716 Mon Sep 17 00:00:00 2001 From: Brett Blomquist <152658160+brettblomquist@users.noreply.github.com> Date: Wed, 16 Apr 2025 09:40:30 -0500 Subject: [PATCH 17/30] Fix function.txt --- function.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/function.txt b/function.txt index c789d88..fd88afa 100644 --- a/function.txt +++ b/function.txt @@ -1,2 +1,3 @@ This is a representation of an unfinished function a group member is working on. -This is a new line from Brett Blomquist. \ No newline at end of file +This is a new line from Brett Blomquist. +This is a new line from Shuang Wu. From ec11172527db9aa7178c59190813543bfd127ece Mon Sep 17 00:00:00 2001 From: Brett Blomquist <152658160+brettblomquist@users.noreply.github.com> Date: Wed, 16 Apr 2025 10:23:02 -0500 Subject: [PATCH 18/30] Update function.txt --- function.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/function.txt b/function.txt index fd88afa..7e47b8e 100644 --- a/function.txt +++ b/function.txt @@ -1,3 +1,2 @@ This is a representation of an unfinished function a group member is working on. This is a new line from Brett Blomquist. -This is a new line from Shuang Wu. From b154fb836a731f6b14daa9fe1a3f44dfa3d93872 Mon Sep 17 00:00:00 2001 From: Brett Blomquist <152658160+brettblomquist@users.noreply.github.com> Date: Wed, 16 Apr 2025 10:55:52 -0500 Subject: [PATCH 19/30] Delete function.txt --- function.txt | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 function.txt diff --git a/function.txt b/function.txt deleted file mode 100644 index 7e47b8e..0000000 --- a/function.txt +++ /dev/null @@ -1,2 +0,0 @@ -This is a representation of an unfinished function a group member is working on. -This is a new line from Brett Blomquist. From 8542575b243bd92b02f58efc0f3d6b2697d851aa Mon Sep 17 00:00:00 2001 From: brettblomquist Date: Wed, 16 Apr 2025 10:58:43 -0500 Subject: [PATCH 20/30] added text function 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..a75c922 --- /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 5decd8bb1a5024fc1f601614d2757e457b70938b Mon Sep 17 00:00:00 2001 From: brettblomquist Date: Wed, 16 Apr 2025 11:22:31 -0500 Subject: [PATCH 21/30] added function.txt --- function.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/function.txt b/function.txt index a75c922..71a2566 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 Brett Blomquist. \ No newline at end of file From fa097e399a6da38393557b7fa71702af79ee9bd5 Mon Sep 17 00:00:00 2001 From: brettblomquist Date: Wed, 16 Apr 2025 11:49:27 -0500 Subject: [PATCH 22/30] added new lines to function --- function.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/function.txt b/function.txt index 71a2566..669ed0c 100644 --- a/function.txt +++ b/function.txt @@ -1,2 +1,3 @@ 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 Brett Blomquist. \ No newline at end of file From 53768c238755dc7e5dc1e125b4dea7e6a5b63549 Mon Sep 17 00:00:00 2001 From: brettblomquist Date: Wed, 16 Apr 2025 14:15:10 -0500 Subject: [PATCH 23/30] Made a 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 778eae869d3904aeb0fb547d54f6e0d0f622b681 Mon Sep 17 00:00:00 2001 From: brettblomquist Date: Wed, 16 Apr 2025 14:16:08 -0500 Subject: [PATCH 24/30] Deleted a 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 59b024ca6538edd68252a7f88e18efe43ebd81bc Mon Sep 17 00:00:00 2001 From: brettblomquist Date: Wed, 16 Apr 2025 14:18:26 -0500 Subject: [PATCH 25/30] Revert "Deleted a very important file" This reverts commit 778eae869d3904aeb0fb547d54f6e0d0f622b681. --- 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 410862f1cb75e68806a3a432a8b350371af31131 Mon Sep 17 00:00:00 2001 From: brettblomquist Date: Wed, 16 Apr 2025 14:20:04 -0500 Subject: [PATCH 26/30] Deleted important.txt --- 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 2dc11170dc4af19808250e44e9c33d2ee2458ead Mon Sep 17 00:00:00 2001 From: brettblomquist Date: Wed, 16 Apr 2025 14:21:33 -0500 Subject: [PATCH 27/30] 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 a55968972c9aff9aeedabb0f4ac47c6c4e532188 Mon Sep 17 00:00:00 2001 From: brettblomquist Date: Wed, 16 Apr 2025 14:22:46 -0500 Subject: [PATCH 28/30] 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 fb3b98b5080222198f9519c73bec153f005a687b Mon Sep 17 00:00:00 2001 From: brettblomquist Date: Wed, 16 Apr 2025 14:24:16 -0500 Subject: [PATCH 29/30] Revert "Deleted very important file" This reverts commit a55968972c9aff9aeedabb0f4ac47c6c4e532188. --- 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 abca11bd2353f2d93880690724e9276d0fea1b74 Mon Sep 17 00:00:00 2001 From: brettblomquist Date: Wed, 16 Apr 2025 14:31:37 -0500 Subject: [PATCH 30/30] fixed page title's from part 1 --- index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index 1434bb3..912a25c 100644 --- a/index.html +++ b/index.html @@ -8,8 +8,8 @@ Shuang's Page - First's Page - First's Page + Elaina's Page + Brett's Page