From 6412fa66cef7f15d577299ff93aa8a8bc6dbe991 Mon Sep 17 00:00:00 2001 From: Ajay123729 Date: Wed, 11 Feb 2026 12:33:31 +0000 Subject: [PATCH 01/26] adds 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 c9ef89392e552d66f3ac9261a7792ecc70644d7c Mon Sep 17 00:00:00 2001 From: Ajay123729 Date: Wed, 11 Feb 2026 18:06:58 +0530 Subject: [PATCH 02/26] Add Example02.md with initial text 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 000000000..a46c98ae9 --- /dev/null +++ b/Example02.md @@ -0,0 +1 @@ +This is some text From fc81f86acad22f3a45d82c4710c54a34e1579f9b Mon Sep 17 00:00:00 2001 From: Ajay123729 Date: Wed, 11 Feb 2026 13:19:32 +0000 Subject: [PATCH 03/26] adding gitStatusDemo.md to demonstrate git status --- gitStatusDemo.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 gitStatusDemo.md diff --git a/gitStatusDemo.md b/gitStatusDemo.md new file mode 100644 index 000000000..8f8833ab3 --- /dev/null +++ b/gitStatusDemo.md @@ -0,0 +1 @@ +Status Demo \ No newline at end of file From d27a449e701eec05927eac9c354e7e8fdef753a9 Mon Sep 17 00:00:00 2001 From: Ajay123729 Date: Wed, 11 Feb 2026 13:22:21 +0000 Subject: [PATCH 04/26] 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 954517c86..a5580a395 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 3a841f97e41fcf2358a65a774b6064facceda502 Mon Sep 17 00:00:00 2001 From: Ajay123729 Date: Wed, 11 Feb 2026 13:27:45 +0000 Subject: [PATCH 05/26] add extra lines to demostrate git diff --- Example.md | 4 +++- Example02.md | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Example.md b/Example.md index a5580a395..ebbf9d25b 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 a46c98ae9..2af04f5bd 100644 --- a/Example02.md +++ b/Example02.md @@ -1 +1 @@ -This is some text +This is some text! From 85e86b046db1e3aed518cbd0ca424ee0c4e34993 Mon Sep 17 00:00:00 2001 From: Ajay123729 Date: Wed, 11 Feb 2026 13:29:40 +0000 Subject: [PATCH 06/26] Remove Example02.md --- Example02.md | 1 - 1 file changed, 1 deletion(-) delete mode 100644 Example02.md diff --git a/Example02.md b/Example02.md deleted file mode 100644 index 2af04f5bd..000000000 --- a/Example02.md +++ /dev/null @@ -1 +0,0 @@ -This is some text! From 08c286d2384cb6549b0c85ee1cd0145d3f70396e Mon Sep 17 00:00:00 2001 From: Ajay123729 Date: Wed, 11 Feb 2026 14:14:24 +0000 Subject: [PATCH 07/26] rename 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 e20ca7c74b259f07aa8a371ccb4cf10d79981bd8 Mon Sep 17 00:00:00 2001 From: Ajay123729 Date: Wed, 11 Feb 2026 14:16:37 +0000 Subject: [PATCH 08/26] 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 353e9c66cbdf2fa6df4bb29536656850ca2cdc07 Mon Sep 17 00:00:00 2001 From: Ajay123729 Date: Wed, 11 Feb 2026 14:21:03 +0000 Subject: [PATCH 09/26] 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 610ca8b98254262fb46fb93ee238a55d8e9800c4 Mon Sep 17 00:00:00 2001 From: Ajay123729 Date: Wed, 11 Feb 2026 14:49:02 +0000 Subject: [PATCH 10/26] 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 000000000..e69de29bb From 5f423b20b5fcee1d54f7e1439399f87b778921ff Mon Sep 17 00:00:00 2001 From: Ajay123729 Date: Sat, 14 Feb 2026 06:21:58 +0000 Subject: [PATCH 11/26] Revert "renames gitStatusDemo.md to newStatus.md" This reverts commit e20ca7c74b259f07aa8a371ccb4cf10d79981bd8. --- newStatus.md => gitStatusDemo.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename newStatus.md => gitStatusDemo.md (100%) diff --git a/newStatus.md b/gitStatusDemo.md similarity index 100% rename from newStatus.md rename to gitStatusDemo.md From 424c1157195b5b22241194f21cac7ae0ff7fc25c Mon Sep 17 00:00:00 2001 From: Ajay123729 Date: Sat, 14 Feb 2026 06:26:38 +0000 Subject: [PATCH 12/26] Adds changes to demostrate the VSCode GUI --- First_Folder/NewName.md | 1 - gitStatusDemo.md | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/First_Folder/NewName.md b/First_Folder/NewName.md index ebbf9d25b..cdbc722fe 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 8f8833ab3..7ca64f595 100644 --- a/gitStatusDemo.md +++ b/gitStatusDemo.md @@ -1 +1,3 @@ -Status Demo \ No newline at end of file +Status Demo + +This is a new line \ No newline at end of file From 8ebcfc40cac690ab959561e8474a090ee3f49d06 Mon Sep 17 00:00:00 2001 From: Ajay123729 Date: Sat, 14 Feb 2026 06:30:57 +0000 Subject: [PATCH 13/26] Commit file for challenge 2 --- Challenge2.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 Challenge2.md diff --git a/Challenge2.md b/Challenge2.md new file mode 100644 index 000000000..3a2da9d15 --- /dev/null +++ b/Challenge2.md @@ -0,0 +1 @@ +Challedge 2 First line \ No newline at end of file From f1f1e9bae0442539f5228bf77575b85fa55b19bd Mon Sep 17 00:00:00 2001 From: Ajay123729 Date: Sat, 14 Feb 2026 06:32:05 +0000 Subject: [PATCH 14/26] Added second line for the challenge 2 --- Challenge2.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Challenge2.md b/Challenge2.md index 3a2da9d15..5c65e8965 100644 --- a/Challenge2.md +++ b/Challenge2.md @@ -1 +1,3 @@ -Challedge 2 First line \ No newline at end of file +Challedge 2 First line + +Second line \ No newline at end of file From 5978dfe70acdf3d61deb487e09d03284178a53ef Mon Sep 17 00:00:00 2001 From: Ajay123729 Date: Sat, 14 Feb 2026 06:33:26 +0000 Subject: [PATCH 15/26] moved challenge 2 file to a folder --- Challenge2/Challenge2.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 Challenge2/Challenge2.md diff --git a/Challenge2/Challenge2.md b/Challenge2/Challenge2.md new file mode 100644 index 000000000..5c65e8965 --- /dev/null +++ b/Challenge2/Challenge2.md @@ -0,0 +1,3 @@ +Challedge 2 First line + +Second line \ No newline at end of file From d749385f55cec76633751fd8cc822a6c31a6143f Mon Sep 17 00:00:00 2001 From: Ajay123729 Date: Sat, 14 Feb 2026 06:34:56 +0000 Subject: [PATCH 16/26] Moved file from main folder to challende 2 folder --- Challenge2.md | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 Challenge2.md diff --git a/Challenge2.md b/Challenge2.md deleted file mode 100644 index 5c65e8965..000000000 --- a/Challenge2.md +++ /dev/null @@ -1,3 +0,0 @@ -Challedge 2 First line - -Second line \ No newline at end of file From 2b6299b84a5172f6fff051c0cc59dd24ec720515 Mon Sep 17 00:00:00 2001 From: Ajay123729 Date: Sat, 14 Feb 2026 06:35:56 +0000 Subject: [PATCH 17/26] Revert "Added second line for the challenge 2" This reverts commit f1f1e9bae0442539f5228bf77575b85fa55b19bd. --- Challenge2/Challenge2.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Challenge2/Challenge2.md b/Challenge2/Challenge2.md index 5c65e8965..3a2da9d15 100644 --- a/Challenge2/Challenge2.md +++ b/Challenge2/Challenge2.md @@ -1,3 +1 @@ -Challedge 2 First line - -Second line \ No newline at end of file +Challedge 2 First line \ No newline at end of file From a6e51451543302913377c9bd676443508b78744c Mon Sep 17 00:00:00 2001 From: Ajay123729 Date: Sat, 14 Feb 2026 06:39:57 +0000 Subject: [PATCH 18/26] Created important_File.md --- important_File.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 important_File.md diff --git a/important_File.md b/important_File.md new file mode 100644 index 000000000..7708231a8 --- /dev/null +++ b/important_File.md @@ -0,0 +1 @@ +This is an important file \ No newline at end of file From 2142f3703dad525f3ed7c43ab58c1fdfca29ffed Mon Sep 17 00:00:00 2001 From: Ajay123729 Date: Sat, 14 Feb 2026 06:41:09 +0000 Subject: [PATCH 19/26] Adds extra line to important_File.md --- important_File.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/important_File.md b/important_File.md index 7708231a8..0ebe8c63f 100644 --- a/important_File.md +++ b/important_File.md @@ -1 +1,3 @@ -This is an important file \ No newline at end of file +This is an important file + +This is an important update \ No newline at end of file From dd287124218ec892cb4063129d81b8d92fae022f Mon Sep 17 00:00:00 2001 From: Ajay123729 Date: Sat, 14 Feb 2026 06:42:28 +0000 Subject: [PATCH 20/26] Moved important_File.md to Imporatant Folder --- important_File.md => Important Folder/important_File.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename important_File.md => Important Folder/important_File.md (100%) diff --git a/important_File.md b/Important Folder/important_File.md similarity index 100% rename from important_File.md rename to Important Folder/important_File.md From ba51b2c9fa9a5f21a3c50cce7a0127145a42a937 Mon Sep 17 00:00:00 2001 From: Ajay123729 Date: Sat, 14 Feb 2026 06:43:26 +0000 Subject: [PATCH 21/26] Revert "Moved important_File.md to Imporatant Folder" This reverts commit dd287124218ec892cb4063129d81b8d92fae022f. --- Important Folder/important_File.md => important_File.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Important Folder/important_File.md => important_File.md (100%) diff --git a/Important Folder/important_File.md b/important_File.md similarity index 100% rename from Important Folder/important_File.md rename to important_File.md From 8d86442d37926f4434b2579cea58181e10ca7fae Mon Sep 17 00:00:00 2001 From: Ajay123729 Date: Sat, 14 Feb 2026 06:49:44 +0000 Subject: [PATCH 22/26] Updated the .gitignore file --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 4b64bc3c5..68c5b5145 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,7 @@ node_modules .tmp npm-debug.log + +log02.log + +Second_Folder/*.log \ No newline at end of file From 8aed6960a2212a70b5958d4597c1067fa4685ad9 Mon Sep 17 00:00:00 2001 From: Ajay123729 Date: Sat, 14 Feb 2026 07:45:36 +0000 Subject: [PATCH 23/26] Creates a folder for logs --- logs/logs01.log | 0 logs/logs02.log0 | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 logs/logs01.log create mode 100644 logs/logs02.log0 diff --git a/logs/logs01.log b/logs/logs01.log new file mode 100644 index 000000000..e69de29bb diff --git a/logs/logs02.log0 b/logs/logs02.log0 new file mode 100644 index 000000000..e69de29bb From 1be0d7629badcf14e4b04e5e59943b6641846c24 Mon Sep 17 00:00:00 2001 From: Ajay123729 Date: Sat, 14 Feb 2026 13:37:02 +0530 Subject: [PATCH 24/26] Update line in gitStatusDemo.md --- gitStatusDemo.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitStatusDemo.md b/gitStatusDemo.md index 7ca64f595..754f45e16 100644 --- a/gitStatusDemo.md +++ b/gitStatusDemo.md @@ -1,3 +1,3 @@ Status Demo -This is a new line \ No newline at end of file +This is a new line, this is a chnage. From cbde291e6777425f44aa06ae2929013cdd62e65b Mon Sep 17 00:00:00 2001 From: Ajay123729 Date: Sat, 14 Feb 2026 08:08:12 +0000 Subject: [PATCH 25/26] adds a change to create a merge conflict --- gitStatusDemo.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitStatusDemo.md b/gitStatusDemo.md index 7ca64f595..b474c2dc2 100644 --- a/gitStatusDemo.md +++ b/gitStatusDemo.md @@ -1,3 +1,3 @@ Status Demo -This is a new line \ No newline at end of file +This is a new line, this is a better change! \ No newline at end of file From 991ae478a5366b68a1c1ccd8b3692785b0646d4b Mon Sep 17 00:00:00 2001 From: Ajay123729 Date: Sat, 14 Feb 2026 08:14:42 +0000 Subject: [PATCH 26/26] adds status.md file with my favorite joke in content for challenge3 --- status.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 status.md diff --git a/status.md b/status.md new file mode 100644 index 000000000..e207a3921 --- /dev/null +++ b/status.md @@ -0,0 +1 @@ +my favorite joke \ No newline at end of file