From b21c918bb713b554278dbe24019ae2df37896bf8 Mon Sep 17 00:00:00 2001 From: "github-classroom[bot]" <66690702+github-classroom[bot]@users.noreply.github.com> Date: Wed, 9 Apr 2025 19:31:26 +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 155a8c24cf67ca4efd930dd18f250fafa1192771 Mon Sep 17 00:00:00 2001 From: Jewel Paulson Date: Wed, 9 Apr 2025 14:42:03 -0500 Subject: [PATCH 02/30] Added my-page-jewel-paulson --- my-page-jewel-paulson.html | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 my-page-jewel-paulson.html diff --git a/my-page-jewel-paulson.html b/my-page-jewel-paulson.html new file mode 100644 index 0000000..0688980 --- /dev/null +++ b/my-page-jewel-paulson.html @@ -0,0 +1,12 @@ + + + + + + Document + + +

This is the page Jewel Paulson added

+ Back + + From a30a931db4f0689439475ca92920b56247729cc9 Mon Sep 17 00:00:00 2001 From: Jewel Paulson Date: Fri, 11 Apr 2025 10:33:17 -0500 Subject: [PATCH 03/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 cf636fe6ee07a124deb6f5a20059c33b1184520d Mon Sep 17 00:00:00 2001 From: Jewel Paulson Date: Fri, 11 Apr 2025 10:35:47 -0500 Subject: [PATCH 04/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..854a404 100644 --- a/index.html +++ b/index.html @@ -6,6 +6,6 @@ GitHub Group Tutorial - Your New Page + Your New Page From 0821f1450570d46483cfb89ee94236513a3fb234 Mon Sep 17 00:00:00 2001 From: kianansarinejad Date: Wed, 16 Apr 2025 14:09:22 -0500 Subject: [PATCH 05/30] added my-page-kian-ansarinejad.html --- my-page-kian-ansarinejad.html | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 my-page-kian-ansarinejad.html diff --git a/my-page-kian-ansarinejad.html b/my-page-kian-ansarinejad.html new file mode 100644 index 0000000..1e221ff --- /dev/null +++ b/my-page-kian-ansarinejad.html @@ -0,0 +1,12 @@ + + + + + + Document + + +

This is the page Kian Ansarinejad added

+ Back + + From a5d01930a4b06da533ba0c0e46ce5a381b87d717 Mon Sep 17 00:00:00 2001 From: kianansarinejad Date: Wed, 16 Apr 2025 16:18:26 -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 eb9e53c..bf98246 100644 --- a/index.html +++ b/index.html @@ -6,6 +6,6 @@ GitHub Group Tutorial - Your New Page + Kian's Page From 1ddb565f03a7fead9e5c326dc701d1a4723f51db Mon Sep 17 00:00:00 2001 From: Garret Date: Wed, 16 Apr 2025 17:20:55 -0500 Subject: [PATCH 07/30] added my-page-first-last.html --- my-page-first-last.html | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 my-page-first-last.html diff --git a/my-page-first-last.html b/my-page-first-last.html new file mode 100644 index 0000000..e0b4d3f --- /dev/null +++ b/my-page-first-last.html @@ -0,0 +1,12 @@ + + + + + + Document + + +

This is the page garret doty added

+ Back + + From 27616d9b38449d8283fc5acfd8193549408e445e Mon Sep 17 00:00:00 2001 From: Garret Date: Wed, 16 Apr 2025 17:27:50 -0500 Subject: [PATCH 08/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 eb9e53c..365ab4b 100644 --- a/index.html +++ b/index.html @@ -6,6 +6,6 @@ GitHub Group Tutorial - Your New Page + First’s Page From 798441888099e17f1795c47f5e11297397c5e77c Mon Sep 17 00:00:00 2001 From: Jewel Paulson Date: Wed, 16 Apr 2025 17:39:43 -0500 Subject: [PATCH 09/30] Update index.html to fix conflict --- index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/index.html b/index.html index 8db651d..04d4044 100644 --- a/index.html +++ b/index.html @@ -6,5 +6,6 @@ GitHub Group Tutorial + Your New Page From 08db8e7e07ca1cc2accd78cf7de84dad14ac3034 Mon Sep 17 00:00:00 2001 From: Garret Date: Wed, 16 Apr 2025 17:44:06 -0500 Subject: [PATCH 10/30] added html with correct file name --- my-page-garret-doty.html | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 my-page-garret-doty.html diff --git a/my-page-garret-doty.html b/my-page-garret-doty.html new file mode 100644 index 0000000..e0b4d3f --- /dev/null +++ b/my-page-garret-doty.html @@ -0,0 +1,12 @@ + + + + + + Document + + +

This is the page garret doty added

+ Back + + From 0e479fa97379c66e3df485310130f8497b85dbee Mon Sep 17 00:00:00 2001 From: Jewel Paulson Date: Wed, 16 Apr 2025 17:46:06 -0500 Subject: [PATCH 11/30] Added function.txt 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..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 db9175760d4f5c668859017f75ac300dd77c2be2 Mon Sep 17 00:00:00 2001 From: Jewel Paulson Date: Wed, 16 Apr 2025 17:46:53 -0500 Subject: [PATCH 12/30] Actually fixed conflict now --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 04d4044..854a404 100644 --- a/index.html +++ b/index.html @@ -6,6 +6,6 @@ GitHub Group Tutorial - Your New Page + Your New Page From 26a016efeb5489760da6438450c89f843392cf25 Mon Sep 17 00:00:00 2001 From: Garret Date: Wed, 16 Apr 2025 17:47:20 -0500 Subject: [PATCH 13/30] removed incorrect file --- my-page-first-last.html | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 my-page-first-last.html diff --git a/my-page-first-last.html b/my-page-first-last.html deleted file mode 100644 index e0b4d3f..0000000 --- a/my-page-first-last.html +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - Document - - -

This is the page garret doty added

- Back - - From 9762941dccbba421a3624a4108afa9d2a4795e2a Mon Sep 17 00:00:00 2001 From: Garret Date: Wed, 16 Apr 2025 17:50:21 -0500 Subject: [PATCH 14/30] changed href --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 365ab4b..1bf4157 100644 --- a/index.html +++ b/index.html @@ -6,6 +6,6 @@ GitHub Group Tutorial - First’s Page + First’s Page From 27b79b3fbf5240f6a4b607d0f100264db8623e23 Mon Sep 17 00:00:00 2001 From: Jewel Paulson Date: Wed, 16 Apr 2025 17:55:37 -0500 Subject: [PATCH 15/30] practiced rebase command --- function.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/function.txt b/function.txt index a994a66..9470c25 100644 --- a/function.txt +++ b/function.txt @@ -1,2 +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 Jewel Paulson. \ No newline at end of file From a19e1799debab227fd307c5be70bbb597c6c1532 Mon Sep 17 00:00:00 2001 From: Garret Date: Wed, 16 Apr 2025 17:59:59 -0500 Subject: [PATCH 16/30] 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 c3d7ae222ef65897b35395a2ef3354faad780e23 Mon Sep 17 00:00:00 2001 From: Garret Date: Wed, 16 Apr 2025 18:05:28 -0500 Subject: [PATCH 17/30] added line to txt file --- function.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/function.txt b/function.txt index 1557ebb..c7bee76 100644 --- a/function.txt +++ b/function.txt @@ -1,2 +1,2 @@ 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 garret doty \ No newline at end of file From 2f5b607ad9a2902bf29e6637e06c6cf9e8a18a40 Mon Sep 17 00:00:00 2001 From: Garret Date: Wed, 16 Apr 2025 20:05:05 -0500 Subject: [PATCH 18/30] added 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 fae6fc37d19cce7996ac39302b7921189ed9afa3 Mon Sep 17 00:00:00 2001 From: kianansarinejad Date: Wed, 16 Apr 2025 21:05:39 -0500 Subject: [PATCH 19/30] added function text file --- function.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/function.txt b/function.txt index ceabd69..e3301e0 100644 --- a/function.txt +++ b/function.txt @@ -2,3 +2,4 @@ This is a representation of an unfinished function a group member is working on. This is a new change from garret doty This is a new change from Jewel Paulson. +This is a new change from kian ansarinejad. From 74dfa727c6e76754f0b455987d16c0632f11e455 Mon Sep 17 00:00:00 2001 From: kianansarinejad Date: Wed, 16 Apr 2025 21:21:53 -0500 Subject: [PATCH 20/30] kian added new line --- function.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/function.txt b/function.txt index e3301e0..16edec8 100644 --- a/function.txt +++ b/function.txt @@ -2,4 +2,4 @@ This is a representation of an unfinished function a group member is working on. This is a new change from garret doty This is a new change from Jewel Paulson. -This is a new change from kian ansarinejad. +This is a new change from kian ansarinejad . From 6e26b510195783205d0fd5f9477bb2140b95e1ea Mon Sep 17 00:00:00 2001 From: kianansarinejad Date: Wed, 16 Apr 2025 22:16:34 -0500 Subject: [PATCH 21/30] Add note about branch changes --- function.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/function.txt b/function.txt index 16edec8..73bf3b6 100644 --- a/function.txt +++ b/function.txt @@ -3,3 +3,4 @@ on. This is a new change from garret doty This is a new change from Jewel Paulson. This is a new change from kian ansarinejad . +This is the changes made to this branch while you were working on rb-test \ No newline at end of file From 089a688d95a2786379a365f55d0c7aa83bd84060 Mon Sep 17 00:00:00 2001 From: kianansarinejad Date: Wed, 16 Apr 2025 22:27:23 -0500 Subject: [PATCH 22/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 c4f7f6e051c27bb7d938f1c501e824d097f80e82 Mon Sep 17 00:00:00 2001 From: kianansarinejad Date: Wed, 16 Apr 2025 22:28:37 -0500 Subject: [PATCH 23/30] Revert "Deleted Very Important File" This reverts commit 089a688d95a2786379a365f55d0c7aa83bd84060. --- 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 b84f2ab28b370dd106284112ecbdcf8001664074 Mon Sep 17 00:00:00 2001 From: kianansarinejad Date: Wed, 16 Apr 2025 22:37:05 -0500 Subject: [PATCH 24/30] Made Very Important File --- important.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/important.txt b/important.txt index e69de29..2e81f8d 100644 --- a/important.txt +++ b/important.txt @@ -0,0 +1 @@ +this i san importatn file \ No newline at end of file From 2b2ca97f7fbc0371e4dc7db3f66f59239f61b5c9 Mon Sep 17 00:00:00 2001 From: kianansarinejad Date: Wed, 16 Apr 2025 22:41:54 -0500 Subject: [PATCH 25/30] Revert "Made" This reverts commit b84f2ab28b370dd106284112ecbdcf8001664074. --- important.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/important.txt b/important.txt index 2e81f8d..e69de29 100644 --- a/important.txt +++ b/important.txt @@ -1 +0,0 @@ -this i san importatn file \ No newline at end of file From d229f8ae8c69b7dd78eebd73846a8bb70a5ce64a Mon Sep 17 00:00:00 2001 From: kianansarinejad Date: Wed, 16 Apr 2025 22:43:56 -0500 Subject: [PATCH 26/30] very important file with a sentence --- important.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/important.txt b/important.txt index e69de29..ed8ea43 100644 --- a/important.txt +++ b/important.txt @@ -0,0 +1 @@ +this is a very important file \ No newline at end of file From e9a4356467a78fd162c2ae8c6ad48213e46d722b Mon Sep 17 00:00:00 2001 From: kianansarinejad Date: Wed, 16 Apr 2025 22:45:44 -0500 Subject: [PATCH 27/30] Deleted Very Important File --- important.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 important.txt diff --git a/important.txt b/important.txt deleted file mode 100644 index ed8ea43..0000000 --- a/important.txt +++ /dev/null @@ -1 +0,0 @@ -this is a very important file \ No newline at end of file From dc0998aa62516f6e364aec1fcaa1d2d1ce88d0f5 Mon Sep 17 00:00:00 2001 From: Jewel Paulson Date: Thu, 17 Apr 2025 19:22:07 -0500 Subject: [PATCH 28/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 f6732ca58bff47be7d0b24cd1ed5dfb07ea1595c Mon Sep 17 00:00:00 2001 From: Jewel Paulson Date: Thu, 17 Apr 2025 19:22:54 -0500 Subject: [PATCH 29/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 a82fe0fb87e029403491d54f7f217aaeafaab338 Mon Sep 17 00:00:00 2001 From: Jewel Paulson Date: Thu, 17 Apr 2025 19:24:27 -0500 Subject: [PATCH 30/30] Revert "Deleted very important file" This reverts commit f6732ca58bff47be7d0b24cd1ed5dfb07ea1595c. --- 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