From 9f6a230fff9cf0548e2abba5019caacd5735a763 Mon Sep 17 00:00:00 2001 From: falcn9 <168264942+falcn9@users.noreply.github.com> Date: Wed, 14 Jan 2026 01:39:46 +0000 Subject: [PATCH 01/24] adds Example.md for demonstration --- Example.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 Example.md diff --git a/Example.md b/Example.md new file mode 100644 index 00000000..eb3a7d80 --- /dev/null +++ b/Example.md @@ -0,0 +1 @@ +this is content! \ No newline at end of file From 4606cab4283e6d76805926cd1f66495fb950deea Mon Sep 17 00:00:00 2001 From: falcn9 <168264942+falcn9@users.noreply.github.com> Date: Tue, 13 Jan 2026 19:51:45 -0600 Subject: [PATCH 02/24] Add example02.md with initial content --- example02.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 example02.md diff --git a/example02.md b/example02.md new file mode 100644 index 00000000..b9639e12 --- /dev/null +++ b/example02.md @@ -0,0 +1 @@ +this is some stuff From a0b365f5448d310a789b0c5004485f6c3a6ded0b Mon Sep 17 00:00:00 2001 From: me Date: Tue, 20 Jan 2026 22:42:08 -0600 Subject: [PATCH 03/24] adding gitStatusDemo.md to demonstrate git status --- gitStatusDemo.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 gitStatusDemo.md diff --git a/gitStatusDemo.md b/gitStatusDemo.md new file mode 100644 index 00000000..e69de29b From 23c7cfa827e59acec9b68d90d264ce0928844949 Mon Sep 17 00:00:00 2001 From: me Date: Tue, 20 Jan 2026 22:59:09 -0600 Subject: [PATCH 04/24] adds an extra line to show how git tracks changes --- Example.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Example.md b/Example.md index eb3a7d80..d0df5cae 100644 --- a/Example.md +++ b/Example.md @@ -1 +1,3 @@ -this is content! \ No newline at end of file +this is content! + +this is an extra line \ No newline at end of file From 4c325857b2af430f418e8b0ee90c85cf147debbf Mon Sep 17 00:00:00 2001 From: me Date: Wed, 21 Jan 2026 13:12:48 -0600 Subject: [PATCH 05/24] adds extra lines, demo of 'git diff' command --- Example.md | 4 +++- example02.md | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Example.md b/Example.md index d0df5cae..25dc6fa5 100644 --- a/Example.md +++ b/Example.md @@ -1,3 +1,5 @@ this is content! -this is an extra line \ No newline at end of file +this is an extra line + +and another small change \ No newline at end of file diff --git a/example02.md b/example02.md index b9639e12..6b5bac79 100644 --- a/example02.md +++ b/example02.md @@ -1 +1 @@ -this is some stuff +this is some stuff! From 8e9aba2940a528d6565b30f79fb423f27388076e Mon Sep 17 00:00:00 2001 From: me Date: Wed, 21 Jan 2026 13:20:40 -0600 Subject: [PATCH 06/24] removes example02.md --- example02.md | 1 - gitStatusDemo.md | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) delete mode 100644 example02.md diff --git a/example02.md b/example02.md deleted file mode 100644 index 6b5bac79..00000000 --- a/example02.md +++ /dev/null @@ -1 +0,0 @@ -this is some stuff! diff --git a/gitStatusDemo.md b/gitStatusDemo.md index e69de29b..8bbaa632 100644 --- a/gitStatusDemo.md +++ b/gitStatusDemo.md @@ -0,0 +1,2 @@ +this is content, a new line + From 2125aedf2b0560e41e33b76298dd71bc855e21e6 Mon Sep 17 00:00:00 2001 From: me Date: Wed, 21 Jan 2026 19:02:17 -0600 Subject: [PATCH 07/24] renames Example.md to newname.md --- Example.md => newname.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Example.md => newname.md (100%) diff --git a/Example.md b/newname.md similarity index 100% rename from Example.md rename to newname.md From 92a0864acf6c5d92eb89284b6f2995c6cfda1b3a Mon Sep 17 00:00:00 2001 From: me Date: Wed, 21 Jan 2026 19:04:21 -0600 Subject: [PATCH 08/24] renames gitStatusDemo.md to newStatus.md --- gitStatusDemo.md => newStatus.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename gitStatusDemo.md => newStatus.md (100%) diff --git a/gitStatusDemo.md b/newStatus.md similarity index 100% rename from gitStatusDemo.md rename to newStatus.md From 956071b62fa36c21c3ca0b1f9c621b120e6b919e Mon Sep 17 00:00:00 2001 From: me Date: Wed, 21 Jan 2026 19:08:09 -0600 Subject: [PATCH 09/24] moves newname.md to First_Folder --- newname.md => First_Folder/newname.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename newname.md => First_Folder/newname.md (100%) diff --git a/newname.md b/First_Folder/newname.md similarity index 100% rename from newname.md rename to First_Folder/newname.md From 6b9a1c776a4f966d98b07355e550158f5fc7b404 Mon Sep 17 00:00:00 2001 From: me Date: Wed, 21 Jan 2026 19:25:38 -0600 Subject: [PATCH 10/24] Adds Second_Folder --- Second_Folder/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Second_Folder/.gitkeep diff --git a/Second_Folder/.gitkeep b/Second_Folder/.gitkeep new file mode 100644 index 00000000..e69de29b From be1906ab651327659dcd08a1d4f19540921c703f Mon Sep 17 00:00:00 2001 From: me Date: Thu, 22 Jan 2026 22:43:45 -0600 Subject: [PATCH 11/24] changed name to gitStatusDemo.md --- gitStatusDemo.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 gitStatusDemo.md diff --git a/gitStatusDemo.md b/gitStatusDemo.md new file mode 100644 index 00000000..0c5484b8 --- /dev/null +++ b/gitStatusDemo.md @@ -0,0 +1,5 @@ +this is content, a new line + +new line + +added a new line From 9aaddf4ff08f26766bfd6638688d54f26c041bc9 Mon Sep 17 00:00:00 2001 From: me Date: Thu, 22 Jan 2026 22:45:57 -0600 Subject: [PATCH 12/24] adds changes to demonstrate the VSCode GUI --- First_Folder/newname.md | 1 - gitStatusDemo.md | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/First_Folder/newname.md b/First_Folder/newname.md index 25dc6fa5..f32d6c77 100644 --- a/First_Folder/newname.md +++ b/First_Folder/newname.md @@ -2,4 +2,3 @@ this is content! this is an extra line -and another small change \ No newline at end of file diff --git a/gitStatusDemo.md b/gitStatusDemo.md index 0c5484b8..c4677ba5 100644 --- a/gitStatusDemo.md +++ b/gitStatusDemo.md @@ -3,3 +3,5 @@ this is content, a new line new line added a new line +add another line + From 4814ecb17499dc776aff3bd6bcaff9627f899428 Mon Sep 17 00:00:00 2001 From: me Date: Fri, 23 Jan 2026 22:58:38 -0600 Subject: [PATCH 13/24] add challengeFile.md --- challengeFile.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 challengeFile.md diff --git a/challengeFile.md b/challengeFile.md new file mode 100644 index 00000000..1fdab438 --- /dev/null +++ b/challengeFile.md @@ -0,0 +1 @@ +here's a line \ No newline at end of file From b3850ed304610b597a8a53100610714b03e28b39 Mon Sep 17 00:00:00 2001 From: me Date: Fri, 23 Jan 2026 22:59:25 -0600 Subject: [PATCH 14/24] adds a new line to challenge.File.md --- challengeFile.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/challengeFile.md b/challengeFile.md index 1fdab438..16870c2b 100644 --- a/challengeFile.md +++ b/challengeFile.md @@ -1 +1,3 @@ -here's a line \ No newline at end of file +here's a line + +here's a new line in addition \ No newline at end of file From 41e93a6f280ab28ee128ea813f5f0550273ced93 Mon Sep 17 00:00:00 2001 From: me Date: Fri, 23 Jan 2026 23:00:36 -0600 Subject: [PATCH 15/24] placed challengeFile.md in First_Folder --- challengeFile.md => First_Folder/challengeFile.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename challengeFile.md => First_Folder/challengeFile.md (100%) diff --git a/challengeFile.md b/First_Folder/challengeFile.md similarity index 100% rename from challengeFile.md rename to First_Folder/challengeFile.md From d1d4df3cf7dc0e188833f4d7b7180f016729a560 Mon Sep 17 00:00:00 2001 From: me Date: Fri, 23 Jan 2026 23:03:22 -0600 Subject: [PATCH 16/24] Revert "placed challengeFile.md in First_Folder" This reverts commit 41e93a6f280ab28ee128ea813f5f0550273ced93. --- First_Folder/challengeFile.md => challengeFile.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename First_Folder/challengeFile.md => challengeFile.md (100%) diff --git a/First_Folder/challengeFile.md b/challengeFile.md similarity index 100% rename from First_Folder/challengeFile.md rename to challengeFile.md From 67ba174131496f6f4e5f3c4a014b42f73d387b05 Mon Sep 17 00:00:00 2001 From: me Date: Sat, 24 Jan 2026 01:32:27 -0600 Subject: [PATCH 17/24] creates a folder with 2 files for logs --- logs/logs01.log | 0 logs/logs02.log | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 logs/logs01.log create mode 100644 logs/logs02.log diff --git a/logs/logs01.log b/logs/logs01.log new file mode 100644 index 00000000..e69de29b diff --git a/logs/logs02.log b/logs/logs02.log new file mode 100644 index 00000000..e69de29b From f792673f271f8ca3814ae4258999728381f74b22 Mon Sep 17 00:00:00 2001 From: falcn9 <168264942+falcn9@users.noreply.github.com> Date: Sat, 24 Jan 2026 09:52:19 -0600 Subject: [PATCH 18/24] Update content in gitStatusDemo.md --- gitStatusDemo.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitStatusDemo.md b/gitStatusDemo.md index c4677ba5..86011407 100644 --- a/gitStatusDemo.md +++ b/gitStatusDemo.md @@ -1,4 +1,4 @@ -this is content, a new line +this is content, a new line... this is a change new line From 46962bf97114e50ee286e271f9c1258db02ae003 Mon Sep 17 00:00:00 2001 From: falcn9 <168264942+falcn9@users.noreply.github.com> Date: Sat, 24 Jan 2026 10:45:20 -0600 Subject: [PATCH 19/24] Add line to demonstrate merge conflict --- gitStatusDemo.md | 1 + 1 file changed, 1 insertion(+) diff --git a/gitStatusDemo.md b/gitStatusDemo.md index 86011407..5cc4b887 100644 --- a/gitStatusDemo.md +++ b/gitStatusDemo.md @@ -5,3 +5,4 @@ new line added a new line add another line +another change to demo merge conflict From fe5ff4deddb8d210f9e9b2963fb7b63a3025dfc7 Mon Sep 17 00:00:00 2001 From: me Date: Sat, 24 Jan 2026 10:50:31 -0600 Subject: [PATCH 20/24] adds change to demo merge conflict again --- gitStatusDemo.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gitStatusDemo.md b/gitStatusDemo.md index 86011407..d79b03ab 100644 --- a/gitStatusDemo.md +++ b/gitStatusDemo.md @@ -1,7 +1,8 @@ -this is content, a new line... this is a change +this is content, a new line... new line added a new line add another line +adding this line to demo merge conflict From 1480d6f756be58c585de73aed689c99c432f8b47 Mon Sep 17 00:00:00 2001 From: falcn9 <168264942+falcn9@users.noreply.github.com> Date: Sat, 24 Jan 2026 11:46:54 -0600 Subject: [PATCH 21/24] Add line about confusion with training Add a line expressing confusion about the training. --- gitStatusDemo.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gitStatusDemo.md b/gitStatusDemo.md index 8a124c10..12f770da 100644 --- a/gitStatusDemo.md +++ b/gitStatusDemo.md @@ -5,3 +5,5 @@ new line added a new line add another line +idk what im doing at this point, nothing is matching with training + From 8c080ca5b3e11e74f8f3b003acbf348a59ac1c06 Mon Sep 17 00:00:00 2001 From: me Date: Sat, 24 Jan 2026 11:48:30 -0600 Subject: [PATCH 22/24] attempting once again 3rd time to demo a merge conflict --- gitStatusDemo.md | 1 + 1 file changed, 1 insertion(+) diff --git a/gitStatusDemo.md b/gitStatusDemo.md index 8a124c10..b522883c 100644 --- a/gitStatusDemo.md +++ b/gitStatusDemo.md @@ -5,3 +5,4 @@ new line added a new line add another line +how do i do this, nothing is working for me... \ No newline at end of file From 5f213ec4a318ea543c6f36e1e8a6e322548cfd0a Mon Sep 17 00:00:00 2001 From: me Date: Sat, 24 Jan 2026 12:05:05 -0600 Subject: [PATCH 23/24] added favorite joke for challenge exercise --- gitStatusDemo.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gitStatusDemo.md b/gitStatusDemo.md index 998f89e7..b136b1e7 100644 --- a/gitStatusDemo.md +++ b/gitStatusDemo.md @@ -6,3 +6,5 @@ added a new line add another line how do i do this, nothing is working for me... + +what did the chicken say to the egg?: you started it \ No newline at end of file From 9a9fe54d7715c24e40d32b0a37746ab1439e8fc6 Mon Sep 17 00:00:00 2001 From: me Date: Sat, 24 Jan 2026 12:09:01 -0600 Subject: [PATCH 24/24] adds another joke for challenge --- joke.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 joke.md diff --git a/joke.md b/joke.md new file mode 100644 index 00000000..7378f27e --- /dev/null +++ b/joke.md @@ -0,0 +1 @@ +pull requests - because asking politely for your code to be rejected is still better than pushing straight to main.😄 \ No newline at end of file