From c8d1485a4955bbfa992a131c282da6d248efadd9 Mon Sep 17 00:00:00 2001 From: "github-classroom[bot]" <66690702+github-classroom[bot]@users.noreply.github.com> Date: Sat, 26 Apr 2025 16:59:40 +0000 Subject: [PATCH 01/17] 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 156ca24c8722c36d3d84c687f879e10e8b61bb21 Mon Sep 17 00:00:00 2001 From: andrewambrosier Date: Sat, 26 Apr 2025 12:08:37 -0500 Subject: [PATCH 02/17] added my-page-andrew-ambrosier.html --- my-page-andrew-ambrosier.html | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 my-page-andrew-ambrosier.html diff --git a/my-page-andrew-ambrosier.html b/my-page-andrew-ambrosier.html new file mode 100644 index 0000000..1c0156e --- /dev/null +++ b/my-page-andrew-ambrosier.html @@ -0,0 +1,12 @@ + + + + + +Document + + +

This is the page Andrew Ambrosier added

+Back + + \ No newline at end of file From 925cd3088d4eed2a64d3f58f9dc7055f2b3e5d4a Mon Sep 17 00:00:00 2001 From: Colin Kuylen Date: Sat, 26 Apr 2025 11:18:40 -0600 Subject: [PATCH 03/17] added my-page-colin-kuylen.html --- my-page-colin-kuylen.html | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 my-page-colin-kuylen.html diff --git a/my-page-colin-kuylen.html b/my-page-colin-kuylen.html new file mode 100644 index 0000000..b3f0a1b --- /dev/null +++ b/my-page-colin-kuylen.html @@ -0,0 +1,12 @@ + + + + + + Document + + +

This is the page ___ added

+ Back + + From a5ae6f0191be040486c9dea8c28a094f448aff04 Mon Sep 17 00:00:00 2001 From: andrewambrosier Date: Sat, 26 Apr 2025 12:23:20 -0500 Subject: [PATCH 04/17] Moodified the index anchor tag --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index ac4fd1a..d9dee61 100644 --- a/index.html +++ b/index.html @@ -6,6 +6,6 @@ GitHub Group Tutorial - Your New Page + Your New Page From 3e16f2e62d68f1affc0b87a944daf1e6fdfe662a Mon Sep 17 00:00:00 2001 From: Colin Kuylen Date: Sat, 26 Apr 2025 11:23:41 -0600 Subject: [PATCH 05/17] Modified the index anchor tag --- index.html | 2 +- my-page-colin-kuylen.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index ac4fd1a..bc98a02 100644 --- a/index.html +++ b/index.html @@ -6,6 +6,6 @@ GitHub Group Tutorial - Your New Page + Your New Page diff --git a/my-page-colin-kuylen.html b/my-page-colin-kuylen.html index b3f0a1b..4c9cfbf 100644 --- a/my-page-colin-kuylen.html +++ b/my-page-colin-kuylen.html @@ -6,7 +6,7 @@ Document -

This is the page ___ added

+

This is the page Colin added

Back From e9bf9665ed9208f9d51396768670ae182e9064c1 Mon Sep 17 00:00:00 2001 From: andrewambrosier Date: Sat, 26 Apr 2025 12:26:07 -0500 Subject: [PATCH 06/17] 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 7eee3e5371799e50b10c9fdfb06c59a973a4f875 Mon Sep 17 00:00:00 2001 From: Fargauche Date: Sat, 26 Apr 2025 12:29:43 -0500 Subject: [PATCH 07/17] added my-page-benjamin-norling.html --- my-page-benjamin-norling.html | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 my-page-benjamin-norling.html diff --git a/my-page-benjamin-norling.html b/my-page-benjamin-norling.html new file mode 100644 index 0000000..307ff39 --- /dev/null +++ b/my-page-benjamin-norling.html @@ -0,0 +1,12 @@ + + + + + + Document + + +

This is the page Benjamin added

+ Back + + From 200775ebac3ee95c22818e1ad9bd31e425bcf0a0 Mon Sep 17 00:00:00 2001 From: Fargauche Date: Sat, 26 Apr 2025 12:37:17 -0500 Subject: [PATCH 08/17] 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..93f975a 100644 --- a/index.html +++ b/index.html @@ -6,6 +6,6 @@ GitHub Group Tutorial - Your New Page + Benjamin’s Page From d19e29049230982e56841318071f4f2f35719f91 Mon Sep 17 00:00:00 2001 From: andrewambrosier Date: Sat, 26 Apr 2025 12:58:20 -0500 Subject: [PATCH 09/17] added names to index --- index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index 136dcd1..204f3c1 100644 --- a/index.html +++ b/index.html @@ -7,7 +7,7 @@ Benjamin’s Page - Your New Page - Your New Page + Colin's Page + Drew's Page From 610c5d5385dd2a3cdc869d3f598eb01fb4098ef2 Mon Sep 17 00:00:00 2001 From: andrewambrosier Date: Sat, 26 Apr 2025 13:00:52 -0500 Subject: [PATCH 10/17] Added function.txt --- 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..a994a66 --- /dev/null +++ b/function.txt @@ -0,0 +1,2 @@ +This is a representation of an unfinished function a group member is working +on. \ No newline at end of file From 1d6aec28e033d1cb17cbcffbf3bdfc6dbd853698 Mon Sep 17 00:00:00 2001 From: Colin Kuylen Date: Sat, 26 Apr 2025 12:00:59 -0600 Subject: [PATCH 11/17] 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 39bbff06153ea7b357bab01d7bca41787f772a63 Mon Sep 17 00:00:00 2001 From: andrewambrosier Date: Sat, 26 Apr 2025 13:03:32 -0500 Subject: [PATCH 12/17] Added change to function.txt --- function.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/function.txt b/function.txt index a994a66..47f6196 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. \ No newline at end of file +on. +This is a new change from Andrew Ambrosier \ No newline at end of file From e57cb081c671532b414c3ffef464f912a2757eae Mon Sep 17 00:00:00 2001 From: Fargauche Date: Sat, 26 Apr 2025 13:05:28 -0500 Subject: [PATCH 13/17] =?UTF-8?q?=E2=80=9Cadded=20function=20text=20file?= =?UTF-8?q?=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 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..f47b8e7 --- /dev/null +++ b/function.txt @@ -0,0 +1,2 @@ +“This is a representation of an unfinished function a group member is working +on.” \ No newline at end of file From a5f562d5acc3b69bef4049406f08432f1d724271 Mon Sep 17 00:00:00 2001 From: Colin Kuylen Date: Sat, 26 Apr 2025 12:07:52 -0600 Subject: [PATCH 14/17] added changes --- my-page-andrew-ambrosier.html | 24 ++++++++++++------------ my-page-benjamin-norling.html | 18 +++++++++--------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/my-page-andrew-ambrosier.html b/my-page-andrew-ambrosier.html index 1c0156e..e2b0488 100644 --- a/my-page-andrew-ambrosier.html +++ b/my-page-andrew-ambrosier.html @@ -1,12 +1,12 @@ - - - - - -Document - - -

This is the page Andrew Ambrosier added

-Back - - \ No newline at end of file + + + + + + Document + + +

This is the page Andrew Ambrosier added

+ Back + + diff --git a/my-page-benjamin-norling.html b/my-page-benjamin-norling.html index 307ff39..5032971 100644 --- a/my-page-benjamin-norling.html +++ b/my-page-benjamin-norling.html @@ -1,12 +1,12 @@ - - - - Document - - -

This is the page Benjamin added

- Back - + + + + Document + + +

This is the page Benjamin added

+ Back + From 9c5a1a1c7255f96132f761eb4e80b703f97f7e1a Mon Sep 17 00:00:00 2001 From: Colin Kuylen Date: Sat, 26 Apr 2025 12:10:48 -0600 Subject: [PATCH 15/17] added changes to function.txt --- function.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/function.txt b/function.txt index 49cc800..bf671de 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 Colin Kuylen \ No newline at end of file From f1b2a5255ae6407e9dcf6f7b0429c724c12dda73 Mon Sep 17 00:00:00 2001 From: Fargauche Date: Sat, 26 Apr 2025 13:10:48 -0500 Subject: [PATCH 16/17] Final staging part 2 --- function.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/function.txt b/function.txt index f47b8e7..f320dec 100644 --- a/function.txt +++ b/function.txt @@ -1,2 +1,4 @@ “This is a representation of an unfinished function a group member is working -on.” \ No newline at end of file +on.” + +This is a new change from Benjmain Norling \ No newline at end of file From d62e900e3a255f5e0f394b3e8c90d985cec322ab Mon Sep 17 00:00:00 2001 From: Fargauche Date: Sat, 26 Apr 2025 13:44:17 -0500 Subject: [PATCH 17/17] Final function changes --- function.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/function.txt b/function.txt index f320dec..9ea67c0 100644 --- a/function.txt +++ b/function.txt @@ -1,4 +1,4 @@ -“This is a representation of an unfinished function a group member is working -on.” +This is a representation of an unfinished function a group member is working +on. This is a new change from Benjmain Norling \ No newline at end of file