From 6b95fed8f57a47fc3b25e400024942d6e84b9d12 Mon Sep 17 00:00:00 2001 From: "github-classroom[bot]" <66690702+github-classroom[bot]@users.noreply.github.com> Date: Wed, 7 May 2025 15:42:17 +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 89b1d95cce48d74cbc79feb733dce908fa14d0be Mon Sep 17 00:00:00 2001 From: Wanjiang Xie Date: Wed, 7 May 2025 11:15:10 -0500 Subject: [PATCH 02/17] Add my personal page --- my-page-wanjiang-xie.html | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 my-page-wanjiang-xie.html diff --git a/my-page-wanjiang-xie.html b/my-page-wanjiang-xie.html new file mode 100644 index 0000000..4696462 --- /dev/null +++ b/my-page-wanjiang-xie.html @@ -0,0 +1,12 @@ + + + + + + Document + + +

This is the page Wanjiang Xie added

+ Back + + From 974937368a73d28ad25a8b6614ae61c6eeea23b9 Mon Sep 17 00:00:00 2001 From: Wanjiang Xie Date: Wed, 7 May 2025 11:19:28 -0500 Subject: [PATCH 03/17] Introduce 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 f779941127a825d3bc79cd4e118ab735d1e667f5 Mon Sep 17 00:00:00 2001 From: Wanjiang Xie Date: Wed, 7 May 2025 11:20:11 -0500 Subject: [PATCH 04/17] Fix link to my page --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index ac4fd1a..d48e61f 100644 --- a/index.html +++ b/index.html @@ -6,6 +6,6 @@ GitHub Group Tutorial - Your New Page + This is Wanjiang's Page From c69b4cc694f1dcfaf159b9daef3c926aefcc4c38 Mon Sep 17 00:00:00 2001 From: Wanjiang Xie Date: Wed, 7 May 2025 11:48:55 -0500 Subject: [PATCH 05/17] Add unfinished function.txt --- 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..376dca8 --- /dev/null +++ b/function.txt @@ -0,0 +1 @@ +This is a representation of an unfinished function a group member is working on. From 74e25d61c2bd33dc3f37be3abebf6031d0546109 Mon Sep 17 00:00:00 2001 From: Wanjiang Xie Date: Wed, 7 May 2025 11:52:23 -0500 Subject: [PATCH 06/17] Add new change from Wanjiang Xie --- function.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/function.txt b/function.txt index 376dca8..2ac95b2 100644 --- a/function.txt +++ b/function.txt @@ -1 +1,2 @@ This is a representation of an unfinished function a group member is working on. +This is a new change from Wanjiang Xie From c1e9b02cef447fbf25386bd48a39973cec094b87 Mon Sep 17 00:00:00 2001 From: Sedar18 Date: Wed, 7 May 2025 11:53:39 -0500 Subject: [PATCH 07/17] added my (sedar) page --- my-page-sedar-hebib.html | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 my-page-sedar-hebib.html diff --git a/my-page-sedar-hebib.html b/my-page-sedar-hebib.html new file mode 100644 index 0000000..cc7e23a --- /dev/null +++ b/my-page-sedar-hebib.html @@ -0,0 +1,12 @@ + + + + + + Document + + +

This is the page Sedar added

+ Back + + \ No newline at end of file From 01753d72be540c25d6463a68bed42a522dfe3dd9 Mon Sep 17 00:00:00 2001 From: Sedar18 Date: Wed, 7 May 2025 12:07:38 -0500 Subject: [PATCH 08/17] replaced 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 2443badb26f22488945dfa602b9fbd3e183136e6 Mon Sep 17 00:00:00 2001 From: Wanjiang Xie Date: Wed, 7 May 2025 12:15:54 -0500 Subject: [PATCH 09/17] Made Very Important File --- important.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 important.txt diff --git a/important.txt b/important.txt new file mode 100644 index 0000000..43a769c --- /dev/null +++ b/important.txt @@ -0,0 +1 @@ +"Very important content" From bbe54200bb9561f7f1e4d45067c4b5b6c526e1bf Mon Sep 17 00:00:00 2001 From: Wanjiang Xie Date: Wed, 7 May 2025 12:16:06 -0500 Subject: [PATCH 10/17] 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 43a769c..0000000 --- a/important.txt +++ /dev/null @@ -1 +0,0 @@ -"Very important content" From 10df2cf907b285e7a5c0665733aec98050e36a3a Mon Sep 17 00:00:00 2001 From: Wanjiang Xie Date: Wed, 7 May 2025 12:29:48 -0500 Subject: [PATCH 11/17] Made Very Important File --- important.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 important.txt diff --git a/important.txt b/important.txt new file mode 100644 index 0000000..43a769c --- /dev/null +++ b/important.txt @@ -0,0 +1 @@ +"Very important content" From 1acd22c876b6508ba2e41f3dd3648db40da59545 Mon Sep 17 00:00:00 2001 From: Wanjiang Xie Date: Wed, 7 May 2025 12:29:56 -0500 Subject: [PATCH 12/17] 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 43a769c..0000000 --- a/important.txt +++ /dev/null @@ -1 +0,0 @@ -"Very important content" From 08775fe295dc6d090823b4e50bbd576fec552be2 Mon Sep 17 00:00:00 2001 From: Wanjiang Xie Date: Wed, 7 May 2025 12:30:52 -0500 Subject: [PATCH 13/17] Revert "Deleted Very Important File" This reverts commit 1acd22c876b6508ba2e41f3dd3648db40da59545. --- important.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 important.txt diff --git a/important.txt b/important.txt new file mode 100644 index 0000000..43a769c --- /dev/null +++ b/important.txt @@ -0,0 +1 @@ +"Very important content" From f3e17036d9c39f4128275c0c9a6b0976f504dbb1 Mon Sep 17 00:00:00 2001 From: Wanjiang Xie Date: Wed, 7 May 2025 13:03:26 -0500 Subject: [PATCH 14/17] Fix link to my personal page --- index.html | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/index.html b/index.html index eb9e53c..ec58845 100644 --- a/index.html +++ b/index.html @@ -1,11 +1,13 @@ - - - - GitHub Group Tutorial - - - Your New Page - + + + + Wanjiang Xie's Page + + +

This is the page Wanjiang Xie added

+ Wanjiang Xie's Page + + From 1c63fc32b40507c295e4a9c7f5b7fbdd26e2b379 Mon Sep 17 00:00:00 2001 From: Wanjiang Xie Date: Thu, 8 May 2025 10:40:52 -0500 Subject: [PATCH 15/17] Add my personal HTML page --- my-page-wanjiang-xie.html | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 my-page-wanjiang-xie.html diff --git a/my-page-wanjiang-xie.html b/my-page-wanjiang-xie.html new file mode 100644 index 0000000..e41aa62 --- /dev/null +++ b/my-page-wanjiang-xie.html @@ -0,0 +1,12 @@ + + + + + + Wanjiang Xie’s Page + + +

This is the page Wanjiang Xie added

+ Back + + From e7ade623b48f9765b067c647069717c1b585c656 Mon Sep 17 00:00:00 2001 From: WanjiangXie Date: Thu, 8 May 2025 10:49:56 -0500 Subject: [PATCH 16/17] Update my-page-wanjiang-xie.html --- my-page-wanjiang-xie.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/my-page-wanjiang-xie.html b/my-page-wanjiang-xie.html index 4696462..ef937c0 100644 --- a/my-page-wanjiang-xie.html +++ b/my-page-wanjiang-xie.html @@ -7,6 +7,6 @@

This is the page Wanjiang Xie added

- Back + My Page (Wanjiang Xie) From d43733150825cdc0e267ad805e6dd4d28d1b0661 Mon Sep 17 00:00:00 2001 From: WanjiangXie Date: Thu, 8 May 2025 10:55:47 -0500 Subject: [PATCH 17/17] Fix link to my page --- my-page-wanjiang-xie.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/my-page-wanjiang-xie.html b/my-page-wanjiang-xie.html index 7c0d5df..4ce827d 100644 --- a/my-page-wanjiang-xie.html +++ b/my-page-wanjiang-xie.html @@ -7,7 +7,7 @@

This is the page Wanjiang Xie added

- Back + My Page (Wanjiang Xie)