From 6e37287e84c327dedb0267630d3780bcc54616b3 Mon Sep 17 00:00:00 2001 From: "github-classroom[bot]" <66690702+github-classroom[bot]@users.noreply.github.com> Date: Sun, 4 May 2025 16:55:17 +0000 Subject: [PATCH 01/18] 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 556646c6ade2e65a0ba9f99ce1ecdafb0c225bec Mon Sep 17 00:00:00 2001 From: Kai Janssen Date: Sun, 4 May 2025 12:09:07 -0500 Subject: [PATCH 02/18] added my-page-first-last.html --- my-page-kai-janssen.html | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 my-page-kai-janssen.html diff --git a/my-page-kai-janssen.html b/my-page-kai-janssen.html new file mode 100644 index 0000000..8810d7b --- /dev/null +++ b/my-page-kai-janssen.html @@ -0,0 +1,12 @@ + + + + + + Document + + +

This is the page Kai Janssen added

+ Back + + From 4b29bc0e1912fc0d0c906a861813f112113c0135 Mon Sep 17 00:00:00 2001 From: Kai Janssen Date: Sun, 4 May 2025 12:18:13 -0500 Subject: [PATCH 03/18] made conflict in indext.html --- index.html | 2 +- my-page-kai-janssen.html | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 my-page-kai-janssen.html 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 diff --git a/my-page-kai-janssen.html b/my-page-kai-janssen.html new file mode 100644 index 0000000..8810d7b --- /dev/null +++ b/my-page-kai-janssen.html @@ -0,0 +1,12 @@ + + + + + + Document + + +

This is the page Kai Janssen added

+ Back + + From 8b8f81c8545dfce238be0fc44422f59d532e0ed1 Mon Sep 17 00:00:00 2001 From: Kai Janssen Date: Sun, 4 May 2025 12:22:15 -0500 Subject: [PATCH 04/18] 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..7fa87d4 100644 --- a/index.html +++ b/index.html @@ -6,6 +6,6 @@ GitHub Group Tutorial - Your New Page + Your New Page From b4b63353a478b5d13a4e756aaff6609eb111355b Mon Sep 17 00:00:00 2001 From: Jamal Mohamed Date: Wed, 7 May 2025 19:41:36 -0500 Subject: [PATCH 05/18] added my-page-jamal-mohamed.html --- my-page-jamal-mohamed.html | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 my-page-jamal-mohamed.html diff --git a/my-page-jamal-mohamed.html b/my-page-jamal-mohamed.html new file mode 100644 index 0000000..e69de29 From 62f9ce27e0902f68f09b5b1f34fe172ff823d835 Mon Sep 17 00:00:00 2001 From: Jamal Mohamed Date: Wed, 7 May 2025 19:46:44 -0500 Subject: [PATCH 06/18] Removed extra page --- my-page-jamal-mohamed.html | 12 ++++++++++++ my-page-kai-janssen.html | 12 ------------ 2 files changed, 12 insertions(+), 12 deletions(-) delete mode 100644 my-page-kai-janssen.html diff --git a/my-page-jamal-mohamed.html b/my-page-jamal-mohamed.html index e69de29..8ef281d 100644 --- a/my-page-jamal-mohamed.html +++ b/my-page-jamal-mohamed.html @@ -0,0 +1,12 @@ + + + + + +Document + + +

This is the page Jamal added

+Back + + \ No newline at end of file diff --git a/my-page-kai-janssen.html b/my-page-kai-janssen.html deleted file mode 100644 index 8810d7b..0000000 --- a/my-page-kai-janssen.html +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - Document - - -

This is the page Kai Janssen added

- Back - - From 5b02511c37cf12bb1230a029bca9f612bdf22757 Mon Sep 17 00:00:00 2001 From: Jamal Mohamed Date: Wed, 7 May 2025 19:52:17 -0500 Subject: [PATCH 07/18] Modified the index anchor tag --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index eb9e53c..2e8506f 100644 --- a/index.html +++ b/index.html @@ -6,6 +6,6 @@ GitHub Group Tutorial - Your New Page + Jamal's Page From 816b6fa01b6f45d7b4e325e72eab02c7f0e14f68 Mon Sep 17 00:00:00 2001 From: Jamal Mohamed Date: Wed, 7 May 2025 19:58:45 -0500 Subject: [PATCH 08/18] Modified the index anchor tag --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 2e8506f..f249ac1 100644 --- a/index.html +++ b/index.html @@ -6,6 +6,6 @@ GitHub Group Tutorial - Jamal's Page + Jamal's Page From d84ee8e90a601c832eed245f1eecf4aadef15a08 Mon Sep 17 00:00:00 2001 From: Jamal Mohamed Date: Wed, 7 May 2025 20:11:11 -0500 Subject: [PATCH 09/18] added function text file --- 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..1557ebb --- /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 911965c337e94254327416601570ace9f3ee100e Mon Sep 17 00:00:00 2001 From: Jamal Mohamed Date: Wed, 7 May 2025 20:14:32 -0500 Subject: [PATCH 10/18] Added new text to file --- function.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/function.txt b/function.txt index 1557ebb..69c79f0 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 Jamal Mohamed \ No newline at end of file From ea39e1cd0e7af850e744e781185ecb18390cd78b Mon Sep 17 00:00:00 2001 From: Jamal Mohamed Date: Wed, 7 May 2025 20:25:49 -0500 Subject: [PATCH 11/18] 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 6cb92d2eb40acd63a87f531c6101cc9a7e759eed Mon Sep 17 00:00:00 2001 From: Jamal Mohamed Date: Wed, 7 May 2025 20:26:36 -0500 Subject: [PATCH 12/18] 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 421b62742f004c898c66ac3ef0424151450ae1a0 Mon Sep 17 00:00:00 2001 From: Jamal Mohamed Date: Wed, 7 May 2025 20:27:59 -0500 Subject: [PATCH 13/18] Revert "Deleted Very Important File" This reverts commit 6cb92d2eb40acd63a87f531c6101cc9a7e759eed. --- 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 afb48ff0650eaa74aa5a4dd19550b8b4e9988099 Mon Sep 17 00:00:00 2001 From: Jamal Mohamed Date: Wed, 7 May 2025 19:41:36 -0500 Subject: [PATCH 14/18] added my-page-jamal-mohamed.html --- my-page-jamal-mohamed.html | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 my-page-jamal-mohamed.html diff --git a/my-page-jamal-mohamed.html b/my-page-jamal-mohamed.html new file mode 100644 index 0000000..e69de29 From 679f5642a6b6df1c6a84cd377cdb6a1589bc2c9b Mon Sep 17 00:00:00 2001 From: Jamal Mohamed Date: Wed, 7 May 2025 19:46:44 -0500 Subject: [PATCH 15/18] Removed extra page --- my-page-jamal-mohamed.html | 12 ++++++++++++ my-page-kai-janssen.html | 12 ------------ 2 files changed, 12 insertions(+), 12 deletions(-) delete mode 100644 my-page-kai-janssen.html diff --git a/my-page-jamal-mohamed.html b/my-page-jamal-mohamed.html index e69de29..8ef281d 100644 --- a/my-page-jamal-mohamed.html +++ b/my-page-jamal-mohamed.html @@ -0,0 +1,12 @@ + + + + + +Document + + +

This is the page Jamal added

+Back + + \ No newline at end of file diff --git a/my-page-kai-janssen.html b/my-page-kai-janssen.html deleted file mode 100644 index 8810d7b..0000000 --- a/my-page-kai-janssen.html +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - Document - - -

This is the page Kai Janssen added

- Back - - From e9402d579e893afce569b166b4ffdccdf9440fe4 Mon Sep 17 00:00:00 2001 From: Jamal Mohamed Date: Wed, 7 May 2025 19:52:17 -0500 Subject: [PATCH 16/18] Modified the index anchor tag --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index eb9e53c..2e8506f 100644 --- a/index.html +++ b/index.html @@ -6,6 +6,6 @@ GitHub Group Tutorial - Your New Page + Jamal's Page From bfb0309bc5bc7c48748f9fd7fa0461a65793ee78 Mon Sep 17 00:00:00 2001 From: Jamal Mohamed Date: Wed, 7 May 2025 19:58:45 -0500 Subject: [PATCH 17/18] Modified the index anchor tag --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 2e8506f..f249ac1 100644 --- a/index.html +++ b/index.html @@ -6,6 +6,6 @@ GitHub Group Tutorial - Jamal's Page + Jamal's Page From 8ee014da0fb44232428e99dbf6b6bb8a3ef140d4 Mon Sep 17 00:00:00 2001 From: Jamal Mohamed Date: Wed, 7 May 2025 20:24:08 -0500 Subject: [PATCH 18/18] Part 3 changes --- function.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/function.txt b/function.txt index 69c79f0..f30ea1f 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 new change from Jamal Mohamed \ No newline at end of file +This is a new change from Jamal Mohamed +This is the changes made to this branch while you were working on rb-test \ No newline at end of file