From 480f145884c2e504c9fb9c31430fc7332547d1e4 Mon Sep 17 00:00:00 2001 From: "github-classroom[bot]" <66690702+github-classroom[bot]@users.noreply.github.com> Date: Wed, 16 Apr 2025 22:49:42 +0000 Subject: [PATCH 01/23] 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 c43c2f71efe35661886f1521f6048170d3806fcc Mon Sep 17 00:00:00 2001 From: ryanwetzstein Date: Wed, 16 Apr 2025 18:00:37 -0500 Subject: [PATCH 02/23] my-page-ryan-wetzstein.html --- my-page-ryan-wetzstein.html | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 my-page-ryan-wetzstein.html diff --git a/my-page-ryan-wetzstein.html b/my-page-ryan-wetzstein.html new file mode 100644 index 0000000..0608ef3 --- /dev/null +++ b/my-page-ryan-wetzstein.html @@ -0,0 +1,12 @@ + + + + + + Document + + +

This is the page Ryan Wetzstein added

+ Back + + From 841f11dc05ee9df0d15511675f00a625a3e7d61d Mon Sep 17 00:00:00 2001 From: ryanwetzstein Date: Wed, 16 Apr 2025 18:02:39 -0500 Subject: [PATCH 03/23] made conflict in index.html --- README.md | 1 + index.html | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e59182e..d418fdf 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ [![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. 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 655f8871b0e01dd62a1a2df6ef3be7245fcb3a30 Mon Sep 17 00:00:00 2001 From: ryanwetzstein Date: Wed, 16 Apr 2025 18:06:22 -0500 Subject: [PATCH 04/23] 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..7c97e44 100644 --- a/index.html +++ b/index.html @@ -6,6 +6,6 @@ GitHub Group Tutorial - Your New Page + First's Page From ad2b628e238efdf4da5099b8943de43981ba6cce Mon Sep 17 00:00:00 2001 From: ryanwetzstein Date: Wed, 16 Apr 2025 18:37:42 -0500 Subject: [PATCH 05/23] 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 f5bf0c0eed3c31a3c9044a2a08a4a63f30145b0f Mon Sep 17 00:00:00 2001 From: ryanwetzstein Date: Wed, 16 Apr 2025 18:38:18 -0500 Subject: [PATCH 06/23] 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 6b5a873458e14c7fce71d642a4f143e6bec698c0 Mon Sep 17 00:00:00 2001 From: ryanwetzstein Date: Wed, 16 Apr 2025 18:39:58 -0500 Subject: [PATCH 07/23] Revert "deleted very important file" This reverts commit f5bf0c0eed3c31a3c9044a2a08a4a63f30145b0f. --- 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 545991686ee7d04cb765480f23d82adde5e16e83 Mon Sep 17 00:00:00 2001 From: ryanwetzstein Date: Wed, 16 Apr 2025 18:46:49 -0500 Subject: [PATCH 08/23] Revert "made very important file" This reverts commit ad2b628e238efdf4da5099b8943de43981ba6cce. --- 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 042fd8119c62bee3e17f480d509df5ed53d66ba4 Mon Sep 17 00:00:00 2001 From: ryanwetzstein Date: Wed, 16 Apr 2025 21:46:41 -0500 Subject: [PATCH 09/23] error fix --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 7c97e44..6a430f9 100644 --- a/index.html +++ b/index.html @@ -6,6 +6,6 @@ GitHub Group Tutorial - First's Page + Ryan's Page From 419c4b8390754a6b73d7fa5ba59ae384ab733dfb Mon Sep 17 00:00:00 2001 From: Zach-Adolphsen Date: Thu, 17 Apr 2025 12:36:12 -0500 Subject: [PATCH 10/23] Modified the index anchor tag --- index.html | 2 +- my-page-zach-adolphsen.html | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 my-page-zach-adolphsen.html diff --git a/index.html b/index.html index 6a430f9..a4e879a 100644 --- a/index.html +++ b/index.html @@ -6,6 +6,6 @@ GitHub Group Tutorial - Ryan's Page + Zach's Page diff --git a/my-page-zach-adolphsen.html b/my-page-zach-adolphsen.html new file mode 100644 index 0000000..ab63363 --- /dev/null +++ b/my-page-zach-adolphsen.html @@ -0,0 +1,12 @@ + + + + + + Document + + +

This is the page ZACH added

+ Back + + From 64b46eded425915d8947b810e506b5f16f0298ee Mon Sep 17 00:00:00 2001 From: Zach-Adolphsen Date: Thu, 17 Apr 2025 12:38:06 -0500 Subject: [PATCH 11/23] Modified the index anchor tag --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index a4e879a..81290f7 100644 --- a/index.html +++ b/index.html @@ -6,6 +6,6 @@ GitHub Group Tutorial - Zach's Page + Zach's Page From 4df26dcd2a52988ac190bfa63d15d4bbccb9b7ff Mon Sep 17 00:00:00 2001 From: Zach-Adolphsen Date: Thu, 17 Apr 2025 12:51:37 -0500 Subject: [PATCH 12/23] Modified the index anchor tag --- index.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index 81290f7..a137c7a 100644 --- a/index.html +++ b/index.html @@ -6,6 +6,7 @@ GitHub Group Tutorial - Zach's Page + Ryan's Page + Zach's Page' From 52389bbd36bc785123d29028238e8897e1cc5f6d Mon Sep 17 00:00:00 2001 From: Zach-Adolphsen Date: Thu, 17 Apr 2025 14:02:00 -0500 Subject: [PATCH 13/23] 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..49cc800 --- /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 ef2ccb0f2956a12564790c5cb68c0561f5eee7fc Mon Sep 17 00:00:00 2001 From: Zach-Adolphsen Date: Thu, 17 Apr 2025 14:06:03 -0500 Subject: [PATCH 14/23] Added "This is a change from..." in function.txt --- function.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/function.txt b/function.txt index 49cc800..ef26be1 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 change from Zach Adolphsen \ No newline at end of file From 7a228f8c4b3d394f43618a34e66fda650ea85136 Mon Sep 17 00:00:00 2001 From: Zach-Adolphsen Date: Thu, 17 Apr 2025 14:16:32 -0500 Subject: [PATCH 15/23] add important.txt --- 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 45b00dc7567f4444aa0617b7c74fff5f46295a4b Mon Sep 17 00:00:00 2001 From: Zach-Adolphsen Date: Thu, 17 Apr 2025 14:18:24 -0500 Subject: [PATCH 16/23] 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 fbb692ad8e73a811845d07303c43ce0b10aba597 Mon Sep 17 00:00:00 2001 From: Zach-Adolphsen Date: Thu, 17 Apr 2025 14:24:33 -0500 Subject: [PATCH 17/23] reverted important.txt deletion --- 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 252c9f99fbfee25c1c54e395c23258cfaf62fdc4 Mon Sep 17 00:00:00 2001 From: Ty Buechler Date: Tue, 22 Apr 2025 16:03:10 -0500 Subject: [PATCH 18/23] added my-page-ty-buechler.html --- my-page-ty-buechler.html | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 my-page-ty-buechler.html diff --git a/my-page-ty-buechler.html b/my-page-ty-buechler.html new file mode 100644 index 0000000..c66a6e4 --- /dev/null +++ b/my-page-ty-buechler.html @@ -0,0 +1,12 @@ + + + + + + Document + + +

This is the page Ty added

+ Back + + \ No newline at end of file From 314e5da9abd4482c3f59cc2fd43934c106deef58 Mon Sep 17 00:00:00 2001 From: lancelisondra9 Date: Tue, 22 Apr 2025 16:08:48 -0500 Subject: [PATCH 19/23] added my-page-lance-lisondra.html --- my-page-lance-lisondra.html | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 my-page-lance-lisondra.html diff --git a/my-page-lance-lisondra.html b/my-page-lance-lisondra.html new file mode 100644 index 0000000..e69de29 From 217a7770e42a6c36714fec6530190ce85ab4c44c Mon Sep 17 00:00:00 2001 From: lancelisondra9 Date: Tue, 22 Apr 2025 16:15:59 -0500 Subject: [PATCH 20/23] Modified the index anchor tag --- index.html | 2 ++ my-page-lance-lisondra.html | 12 ++++++++++++ 2 files changed, 14 insertions(+) diff --git a/index.html b/index.html index a137c7a..16640b9 100644 --- a/index.html +++ b/index.html @@ -8,5 +8,7 @@ Ryan's Page Zach's Page' + Zach's Page' + diff --git a/my-page-lance-lisondra.html b/my-page-lance-lisondra.html index e69de29..d0003f0 100644 --- a/my-page-lance-lisondra.html +++ b/my-page-lance-lisondra.html @@ -0,0 +1,12 @@ + + + + + + Document + + +

This is the page Lance Lisondra added

+ Back + + From f87f681f64f19b511a15c2598ae0b6e3a75d02f7 Mon Sep 17 00:00:00 2001 From: Ty Buechler Date: Tue, 22 Apr 2025 16:21:47 -0500 Subject: [PATCH 21/23] Commiting my page --- my-page-ty-buechler.html | 1 + 1 file changed, 1 insertion(+) diff --git a/my-page-ty-buechler.html b/my-page-ty-buechler.html index c66a6e4..90547f2 100644 --- a/my-page-ty-buechler.html +++ b/my-page-ty-buechler.html @@ -7,6 +7,7 @@

This is the page Ty added

+

Test

Back \ No newline at end of file From ee05ca1260607b4cd0e0a654196e647a6341edd4 Mon Sep 17 00:00:00 2001 From: Ty Buechler Date: Tue, 22 Apr 2025 16:28:16 -0500 Subject: [PATCH 22/23] Test --- my-page-ty-buechler.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/my-page-ty-buechler.html b/my-page-ty-buechler.html index 90547f2..d07738a 100644 --- a/my-page-ty-buechler.html +++ b/my-page-ty-buechler.html @@ -7,7 +7,7 @@

This is the page Ty added

-

Test

+

Test1

Back \ No newline at end of file From 98841aaf13d71a75d6791e9d270dc7032d02d118 Mon Sep 17 00:00:00 2001 From: lancelisondra9 Date: Tue, 22 Apr 2025 16:52:04 -0500 Subject: [PATCH 23/23] Modified function.txt --- function.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/function.txt b/function.txt index ef26be1..d99d19a 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 change from Zach Adolphsen \ No newline at end of file +This is a change from Zach Adolphsen +This is a change from Lance Lisondra