From 511b469b72ba0ab4da4aba1ec10a93f6c7117916 Mon Sep 17 00:00:00 2001 From: albrittonc1960 <124378010+albrittonc1960@users.noreply.github.com> Date: Tue, 24 Feb 2026 21:56:49 +0000 Subject: [PATCH 01/28] adds the Example.md to demonstrate the git process --- 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 000000000..954517c86 --- /dev/null +++ b/Example.md @@ -0,0 +1 @@ +This is content \ No newline at end of file From c910a8a4cfbef3bf68ba05eac380d98b5d4aeb35 Mon Sep 17 00:00:00 2001 From: albrittonc1960 <124378010+albrittonc1960@users.noreply.github.com> Date: Tue, 24 Feb 2026 22:10:11 +0000 Subject: [PATCH 02/28] I Made changes to Example.md --- Example.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Example.md b/Example.md index 954517c86..a021858b8 100644 --- a/Example.md +++ b/Example.md @@ -1 +1,2 @@ -This is content \ No newline at end of file +This is content +This is more content \ No newline at end of file From b5cb73dd295da3fb8e9ba3a3b4ccf81e37fefe8b Mon Sep 17 00:00:00 2001 From: albrittonc1960 <124378010+albrittonc1960@users.noreply.github.com> Date: Tue, 24 Feb 2026 17:15:35 -0500 Subject: [PATCH 03/28] Create Example02.md --- 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 000000000..445f5432c --- /dev/null +++ b/Example02.md @@ -0,0 +1 @@ +This is the second example From 300329656d1381a63cf17b302aaac57e8e1eb5d2 Mon Sep 17 00:00:00 2001 From: Steve Date: Wed, 25 Feb 2026 09:17:37 -0500 Subject: [PATCH 04/28] Adding Test file --- TEst1 | 1 + 1 file changed, 1 insertion(+) create mode 100644 TEst1 diff --git a/TEst1 b/TEst1 new file mode 100644 index 000000000..a1291b42d --- /dev/null +++ b/TEst1 @@ -0,0 +1 @@ +This is some text to test with From 0fc284b2eb198286356705c110b1bdc16ddbedd7 Mon Sep 17 00:00:00 2001 From: Steve Date: Wed, 25 Feb 2026 09:24:05 -0500 Subject: [PATCH 05/28] Moving test file into first folder --- TEst1 => FirstFolder/TEst1 | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename TEst1 => FirstFolder/TEst1 (100%) diff --git a/TEst1 b/FirstFolder/TEst1 similarity index 100% rename from TEst1 rename to FirstFolder/TEst1 From 1e68ffde8757385a2f2b580c63aab60596431176 Mon Sep 17 00:00:00 2001 From: Steve Date: Wed, 25 Feb 2026 09:27:00 -0500 Subject: [PATCH 06/28] adding 2nd folder and gitkeep file --- SecondFolder/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 SecondFolder/.gitkeep diff --git a/SecondFolder/.gitkeep b/SecondFolder/.gitkeep new file mode 100644 index 000000000..e69de29bb From 20a338efb2d21253cc723976ab1a93ee0bd02ec3 Mon Sep 17 00:00:00 2001 From: Steve Date: Wed, 25 Feb 2026 10:41:14 -0500 Subject: [PATCH 07/28] "Added a line to this text file" --- Example02.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Example02.md b/Example02.md index 445f5432c..77183d448 100644 --- a/Example02.md +++ b/Example02.md @@ -1 +1,2 @@ This is the second example +New text for the example \ No newline at end of file From 0e69eac8ce8a42df6e11fb57285564514013935f Mon Sep 17 00:00:00 2001 From: Steve Date: Wed, 25 Feb 2026 10:47:04 -0500 Subject: [PATCH 08/28] added challenge.md in order to commit to the online version --- ChallegeFile.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 ChallegeFile.md diff --git a/ChallegeFile.md b/ChallegeFile.md new file mode 100644 index 000000000..28142ba2b --- /dev/null +++ b/ChallegeFile.md @@ -0,0 +1 @@ +**New file for LinkedIn Challenge** \ No newline at end of file From c63bdad0eeed56cc17e3d7f3d2f19b7de5f632b4 Mon Sep 17 00:00:00 2001 From: Steve Date: Wed, 25 Feb 2026 10:48:11 -0500 Subject: [PATCH 09/28] moved challenge file to first folder --- ChallegeFile.md => FirstFolder/ChallegeFile.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename ChallegeFile.md => FirstFolder/ChallegeFile.md (100%) diff --git a/ChallegeFile.md b/FirstFolder/ChallegeFile.md similarity index 100% rename from ChallegeFile.md rename to FirstFolder/ChallegeFile.md From 9c5922e90cb9f29a210958151b9bfb7216fd805d Mon Sep 17 00:00:00 2001 From: Steve Date: Wed, 25 Feb 2026 10:54:51 -0500 Subject: [PATCH 10/28] added a line to Challenge file --- FirstFolder/ChallegeFile.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/FirstFolder/ChallegeFile.md b/FirstFolder/ChallegeFile.md index 28142ba2b..2afc4b501 100644 --- a/FirstFolder/ChallegeFile.md +++ b/FirstFolder/ChallegeFile.md @@ -1 +1,3 @@ -**New file for LinkedIn Challenge** \ No newline at end of file +**New file for LinkedIn Challenge** + +New text for file \ No newline at end of file From 527c8ae8ffdb67a178d5c0f146611c697d6defa9 Mon Sep 17 00:00:00 2001 From: Steve Date: Wed, 25 Feb 2026 10:58:51 -0500 Subject: [PATCH 11/28] added another line to check the revert command --- FirstFolder/ChallegeFile.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FirstFolder/ChallegeFile.md b/FirstFolder/ChallegeFile.md index 2afc4b501..6aec7c7c2 100644 --- a/FirstFolder/ChallegeFile.md +++ b/FirstFolder/ChallegeFile.md @@ -1,3 +1,3 @@ **New file for LinkedIn Challenge** -New text for file \ No newline at end of file +2nd new line for challenge file \ No newline at end of file From 7450494348ed952826c5635873f41398c2d0f2c7 Mon Sep 17 00:00:00 2001 From: Steve Date: Wed, 25 Feb 2026 11:02:59 -0500 Subject: [PATCH 12/28] One last try for the revert command --- FirstFolder/ChallegeFile.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FirstFolder/ChallegeFile.md b/FirstFolder/ChallegeFile.md index 6aec7c7c2..2afc4b501 100644 --- a/FirstFolder/ChallegeFile.md +++ b/FirstFolder/ChallegeFile.md @@ -1,3 +1,3 @@ **New file for LinkedIn Challenge** -2nd new line for challenge file \ No newline at end of file +New text for file \ No newline at end of file From 5a4979973313a7956fc4bd31c7b759d9481ac5d3 Mon Sep 17 00:00:00 2001 From: Steve Date: Wed, 25 Feb 2026 11:06:01 -0500 Subject: [PATCH 13/28] Revert "One last try for the revert command" This reverts commit 7450494348ed952826c5635873f41398c2d0f2c7. --- FirstFolder/ChallegeFile.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FirstFolder/ChallegeFile.md b/FirstFolder/ChallegeFile.md index 2afc4b501..6aec7c7c2 100644 --- a/FirstFolder/ChallegeFile.md +++ b/FirstFolder/ChallegeFile.md @@ -1,3 +1,3 @@ **New file for LinkedIn Challenge** -New text for file \ No newline at end of file +2nd new line for challenge file \ No newline at end of file From 4f45401dad5ba0bb1acb52032fa4732921278e67 Mon Sep 17 00:00:00 2001 From: Steve Date: Wed, 25 Feb 2026 11:14:18 -0500 Subject: [PATCH 14/28] Commit this last time at 11:15 --- FirstFolder/ChallegeFile.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FirstFolder/ChallegeFile.md b/FirstFolder/ChallegeFile.md index 6aec7c7c2..2afc4b501 100644 --- a/FirstFolder/ChallegeFile.md +++ b/FirstFolder/ChallegeFile.md @@ -1,3 +1,3 @@ **New file for LinkedIn Challenge** -2nd new line for challenge file \ No newline at end of file +New text for file \ No newline at end of file From ae9c2f9587b3c0832f1d9ef7717e65da4fe98e15 Mon Sep 17 00:00:00 2001 From: Steve Date: Wed, 25 Feb 2026 11:17:00 -0500 Subject: [PATCH 15/28] added second line to Callenge file --- FirstFolder/ChallegeFile.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/FirstFolder/ChallegeFile.md b/FirstFolder/ChallegeFile.md index 2afc4b501..68c210317 100644 --- a/FirstFolder/ChallegeFile.md +++ b/FirstFolder/ChallegeFile.md @@ -1,3 +1,4 @@ **New file for LinkedIn Challenge** -New text for file \ No newline at end of file +New text for file +More new text From 3bc3b5cdc8c27bf0a621c40152d4d34c973753f2 Mon Sep 17 00:00:00 2001 From: Steve Date: Wed, 25 Feb 2026 11:34:06 -0500 Subject: [PATCH 16/28] 1133 change to CallengeFile.md --- FirstFolder/ChallegeFile.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/FirstFolder/ChallegeFile.md b/FirstFolder/ChallegeFile.md index 68c210317..2afc4b501 100644 --- a/FirstFolder/ChallegeFile.md +++ b/FirstFolder/ChallegeFile.md @@ -1,4 +1,3 @@ **New file for LinkedIn Challenge** -New text for file -More new text +New text for file \ No newline at end of file From c3f8d3568ebe58a2691815d3c61185298e0ca71e Mon Sep 17 00:00:00 2001 From: Steve Date: Wed, 25 Feb 2026 11:37:44 -0500 Subject: [PATCH 17/28] Added logfolder and two logFiles --- logs/logFile01.md | 0 logs/logFile02 | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 logs/logFile01.md create mode 100644 logs/logFile02 diff --git a/logs/logFile01.md b/logs/logFile01.md new file mode 100644 index 000000000..e69de29bb diff --git a/logs/logFile02 b/logs/logFile02 new file mode 100644 index 000000000..e69de29bb From 17f4a0b4e7070dc56c7023867c87388a4bf2f3ab Mon Sep 17 00:00:00 2001 From: albrittonc1960 <124378010+albrittonc1960@users.noreply.github.com> Date: Wed, 25 Feb 2026 12:19:27 -0500 Subject: [PATCH 18/28] Create gitStatus.md --- gitStatus.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 gitStatus.md diff --git a/gitStatus.md b/gitStatus.md new file mode 100644 index 000000000..a46c98ae9 --- /dev/null +++ b/gitStatus.md @@ -0,0 +1 @@ +This is some text From bf199a56ab8b00a53494e79eab33d6f235183742 Mon Sep 17 00:00:00 2001 From: albrittonc1960 <124378010+albrittonc1960@users.noreply.github.com> Date: Wed, 25 Feb 2026 12:21:52 -0500 Subject: [PATCH 19/28] adds text to gitStatus.md --- gitStatus.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitStatus.md b/gitStatus.md index a46c98ae9..c5e6301a3 100644 --- a/gitStatus.md +++ b/gitStatus.md @@ -1 +1 @@ -This is some text +This is some text, this is some more text From dde1f9ab2766611ed78b22e8303f9e33a91c3567 Mon Sep 17 00:00:00 2001 From: Steve Date: Wed, 25 Feb 2026 12:31:01 -0500 Subject: [PATCH 20/28] changes a file to create a merge conflict --- getStatus.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 getStatus.md diff --git a/getStatus.md b/getStatus.md new file mode 100644 index 000000000..3b1aa5c3e --- /dev/null +++ b/getStatus.md @@ -0,0 +1 @@ +This is some text, different than online to create a merge conflict \ No newline at end of file From fdbf5d1dbaaa60e1178ff33b6f2d0320a9b5f516 Mon Sep 17 00:00:00 2001 From: albrittonc1960 <124378010+albrittonc1960@users.noreply.github.com> Date: Wed, 25 Feb 2026 12:33:54 -0500 Subject: [PATCH 21/28] Update gitStatus.md --- gitStatus.md | 1 + 1 file changed, 1 insertion(+) diff --git a/gitStatus.md b/gitStatus.md index c5e6301a3..fab02c257 100644 --- a/gitStatus.md +++ b/gitStatus.md @@ -1 +1,2 @@ This is some text, this is some more text +This is chnages tpo create a merge conflict From 0fbe59efab02ab3f1412c875c22798b24bd08ef6 Mon Sep 17 00:00:00 2001 From: Steve Date: Wed, 25 Feb 2026 12:34:36 -0500 Subject: [PATCH 22/28] Changes file to create amerge conflict with online file --- getStatus.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/getStatus.md b/getStatus.md index 3b1aa5c3e..7c04df60a 100644 --- a/getStatus.md +++ b/getStatus.md @@ -1 +1 @@ -This is some text, different than online to create a merge conflict \ No newline at end of file +This is some text, different than online to create a merge conflict!! \ No newline at end of file From 11a6c6a05b58ff8582baf83841cbd08643e30cc7 Mon Sep 17 00:00:00 2001 From: albrittonc1960 <124378010+albrittonc1960@users.noreply.github.com> Date: Wed, 25 Feb 2026 12:37:25 -0500 Subject: [PATCH 23/28] Update gitStatus.md --- gitStatus.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitStatus.md b/gitStatus.md index fab02c257..893f5c92a 100644 --- a/gitStatus.md +++ b/gitStatus.md @@ -1,2 +1,2 @@ This is some text, this is some more text -This is chnages tpo create a merge conflict +This is changes to create a merge conflict From 4272d02305adf5aed30b00f73de2c81b0bab3610 Mon Sep 17 00:00:00 2001 From: Steve Date: Wed, 25 Feb 2026 12:38:22 -0500 Subject: [PATCH 24/28] changes to creat another merge conflict --- getStatus.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/getStatus.md b/getStatus.md index 7c04df60a..35e7ccaf2 100644 --- a/getStatus.md +++ b/getStatus.md @@ -1 +1 @@ -This is some text, different than online to create a merge conflict!! \ No newline at end of file +This is some text, different than online to create a merge conflict!!! \ No newline at end of file From 6684fd5ef0eeffc6a5b3ed65f7fc6adf6eee1a5f Mon Sep 17 00:00:00 2001 From: albrittonc1960 <124378010+albrittonc1960@users.noreply.github.com> Date: Wed, 25 Feb 2026 12:42:55 -0500 Subject: [PATCH 25/28] Update gitStatus.md --- gitStatus.md | 1 + 1 file changed, 1 insertion(+) diff --git a/gitStatus.md b/gitStatus.md index 893f5c92a..a69029d97 100644 --- a/gitStatus.md +++ b/gitStatus.md @@ -1,2 +1,3 @@ This is some text, this is some more text This is changes to create a merge conflict +Changed online From e2beebdc8341ac61ccd36b1b1ab6771a899ae8e1 Mon Sep 17 00:00:00 2001 From: Steve Date: Wed, 25 Feb 2026 12:44:21 -0500 Subject: [PATCH 26/28] Changes getStatus from local to online (Hopefully) --- getStatus.md | 1 - gitStatus.md | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 getStatus.md diff --git a/getStatus.md b/getStatus.md deleted file mode 100644 index 35e7ccaf2..000000000 --- a/getStatus.md +++ /dev/null @@ -1 +0,0 @@ -This is some text, different than online to create a merge conflict!!! \ No newline at end of file diff --git a/gitStatus.md b/gitStatus.md index 893f5c92a..d7e788a58 100644 --- a/gitStatus.md +++ b/gitStatus.md @@ -1,2 +1,3 @@ This is some text, this is some more text This is changes to create a merge conflict +Changed locally From 9f7cd320ec6947375680a4640eff8a9e9dcc5485 Mon Sep 17 00:00:00 2001 From: Steve Date: Wed, 25 Feb 2026 12:53:14 -0500 Subject: [PATCH 27/28] this is a new file in a new branch called newChanges. I have made some changes to the gitStatus.md file and now I am going to commit those changes with a commit message that describes what I have done. --- gitStatus.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gitStatus.md b/gitStatus.md index cfcf8e733..1eb85975b 100644 --- a/gitStatus.md +++ b/gitStatus.md @@ -1,4 +1,5 @@ This is some text, this is some more text This is changes to create a merge conflict Changed locally -git \ No newline at end of file +Why am I running in circles? +Shut up or I'll nail hyour other foot to the floor \ No newline at end of file From d14ed666e3fee767e098176419b5a29951c034e0 Mon Sep 17 00:00:00 2001 From: Steve Date: Wed, 25 Feb 2026 13:01:58 -0500 Subject: [PATCH 28/28] Chages joke in the new branch --- gitStatus.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitStatus.md b/gitStatus.md index 1eb85975b..012ffff54 100644 --- a/gitStatus.md +++ b/gitStatus.md @@ -2,4 +2,4 @@ This is some text, this is some more text This is changes to create a merge conflict Changed locally Why am I running in circles? -Shut up or I'll nail hyour other foot to the floor \ No newline at end of file +Shut up or I'll nail your other foot to the floor \ No newline at end of file