From 0cc93bcb2c12b3f8586f0e76627cc7519da2c231 Mon Sep 17 00:00:00 2001 From: MashtiK Date: Sat, 6 Dec 2025 19:54:55 +0100 Subject: [PATCH 01/19] add 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 00000000..954517c8 --- /dev/null +++ b/Example.md @@ -0,0 +1 @@ +This is content \ No newline at end of file From cb7ce324405f5eec75f2a19dda73a9172d481731 Mon Sep 17 00:00:00 2001 From: MashtiK Date: Sat, 6 Dec 2025 20:57:52 +0100 Subject: [PATCH 02/19] Add content to Example02.md for testing --- 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..bdc1ee13 --- /dev/null +++ b/Example02.md @@ -0,0 +1 @@ +this is a content to test Pull feature From 2e464baef36f96b5097860382aa4508d0751bc0d Mon Sep 17 00:00:00 2001 From: MashtiK Date: Sat, 6 Dec 2025 21:06:54 +0100 Subject: [PATCH 03/19] I am adding my first challenge --- challenge01.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 challenge01.md diff --git a/challenge01.md b/challenge01.md new file mode 100644 index 00000000..c57b2a0a --- /dev/null +++ b/challenge01.md @@ -0,0 +1 @@ +this is my first file to push to repo From db330369253fb114f7a34ddc1031c78917b401f0 Mon Sep 17 00:00:00 2001 From: MashtiK Date: Sun, 7 Dec 2025 08:54:09 +0100 Subject: [PATCH 04/19] commit modification in Example.md --- Example.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Example.md b/Example.md index 954517c8..5909ab53 100644 --- a/Example.md +++ b/Example.md @@ -1 +1,2 @@ -This is content \ No newline at end of file +This is content +to change the text for a new commit \ No newline at end of file From feb948eee41607ce6432dc444464708dfca21427 Mon Sep 17 00:00:00 2001 From: MashtiK Date: Sun, 7 Dec 2025 09:09:10 +0100 Subject: [PATCH 05/19] changes to demonstrate git options to follow the changes --- Example.md | 3 ++- Example02.md | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Example.md b/Example.md index 5909ab53..b88cd591 100644 --- a/Example.md +++ b/Example.md @@ -1,2 +1,3 @@ This is content -to change the text for a new commit \ No newline at end of file +to change the text for a new commit +another change \ No newline at end of file diff --git a/Example02.md b/Example02.md index bdc1ee13..b5151be3 100644 --- a/Example02.md +++ b/Example02.md @@ -1 +1,2 @@ this is a content to test Pull feature +change of different files \ No newline at end of file From 1e1d7d47d8e0b249797200642efbd0a52d57cd63 Mon Sep 17 00:00:00 2001 From: MashtiK Date: Sun, 7 Dec 2025 09:13:08 +0100 Subject: [PATCH 06/19] Example02.md deleted --- Example02.md | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 Example02.md diff --git a/Example02.md b/Example02.md deleted file mode 100644 index b5151be3..00000000 --- a/Example02.md +++ /dev/null @@ -1,2 +0,0 @@ -this is a content to test Pull feature -change of different files \ No newline at end of file From e40a0bf302d865962517e5b552500e6f4dd2451b Mon Sep 17 00:00:00 2001 From: MashtiK Date: Sun, 7 Dec 2025 09:23:14 +0100 Subject: [PATCH 07/19] name change 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 bf50f503743527024105674a5152185da4b57f26 Mon Sep 17 00:00:00 2001 From: MashtiK Date: Sun, 7 Dec 2025 09:26:26 +0100 Subject: [PATCH 08/19] file rename challenge01.md to Challenge01.md --- challenge01.md => Challenge01.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename challenge01.md => Challenge01.md (100%) diff --git a/challenge01.md b/Challenge01.md similarity index 100% rename from challenge01.md rename to Challenge01.md From a09156f2fcdfc924e14fc692ddf915bd23436049 Mon Sep 17 00:00:00 2001 From: MashtiK Date: Sun, 7 Dec 2025 11:05:19 +0100 Subject: [PATCH 09/19] move NwName.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 15103110b17c03251f782ff4d1b443897faef436 Mon Sep 17 00:00:00 2001 From: MashtiK Date: Sun, 7 Dec 2025 11:09:54 +0100 Subject: [PATCH 10/19] addning 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 b1d3260722ceee79e5c24d55b633d608f7e112d3 Mon Sep 17 00:00:00 2001 From: MashtiK Date: Wed, 10 Dec 2025 15:03:52 +0100 Subject: [PATCH 11/19] revert challenge01 --- First Folder/NewName.md | 2 +- Challenge01.md => challenge01.md | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename Challenge01.md => challenge01.md (100%) diff --git a/First Folder/NewName.md b/First Folder/NewName.md index b88cd591..4ff9d414 100644 --- a/First Folder/NewName.md +++ b/First Folder/NewName.md @@ -1,3 +1,3 @@ This is content to change the text for a new commit -another change \ No newline at end of file +another change \ No newline at end of file diff --git a/Challenge01.md b/challenge01.md similarity index 100% rename from Challenge01.md rename to challenge01.md From c442cc251dc99f3ab33cbb5fdba56b17a5e4016d Mon Sep 17 00:00:00 2001 From: MashtiK Date: Wed, 10 Dec 2025 15:08:35 +0100 Subject: [PATCH 12/19] test gui --- First Folder/NewName.md | 4 +++- challenge01.md | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/First Folder/NewName.md b/First Folder/NewName.md index 4ff9d414..1f005963 100644 --- a/First Folder/NewName.md +++ b/First Folder/NewName.md @@ -1,3 +1,5 @@ This is content to change the text for a new commit -another change \ No newline at end of file +another change + +test gui \ No newline at end of file diff --git a/challenge01.md b/challenge01.md index c57b2a0a..435e67f9 100644 --- a/challenge01.md +++ b/challenge01.md @@ -1 +1,2 @@ this is my first file to push to repo +test gui \ No newline at end of file From 683d098f1b6f28bd9b597581edaf0f1ab5f062b3 Mon Sep 17 00:00:00 2001 From: MashtiK Date: Wed, 10 Dec 2025 15:13:50 +0100 Subject: [PATCH 13/19] challenge02.md has been created --- challenge02.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 challenge02.md diff --git a/challenge02.md b/challenge02.md new file mode 100644 index 00000000..c0018a20 --- /dev/null +++ b/challenge02.md @@ -0,0 +1 @@ +This is the second challenge to test the revert optionc From 668c20abdf792e5bb2ec66c9c4ba941ea9cd6b4f Mon Sep 17 00:00:00 2001 From: MashtiK Date: Wed, 10 Dec 2025 15:15:00 +0100 Subject: [PATCH 14/19] challenge02.m modified --- challenge02.md | 1 + 1 file changed, 1 insertion(+) diff --git a/challenge02.md b/challenge02.md index c0018a20..ea47f07d 100644 --- a/challenge02.md +++ b/challenge02.md @@ -1 +1,2 @@ This is the second challenge to test the revert optionc +this is the second line \ No newline at end of file From 02b432294a150f837f6d2f1b5a94d27233d8421d Mon Sep 17 00:00:00 2001 From: MashtiK Date: Wed, 10 Dec 2025 15:16:29 +0100 Subject: [PATCH 15/19] challenged02.md moved to First Folder --- challenge02.md => First Folder/challenge02.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename challenge02.md => First Folder/challenge02.md (100%) diff --git a/challenge02.md b/First Folder/challenge02.md similarity index 100% rename from challenge02.md rename to First Folder/challenge02.md From 7c8c13888a268b11951245742b6d819d4149e9e9 Mon Sep 17 00:00:00 2001 From: MashtiK Date: Wed, 10 Dec 2025 15:19:04 +0100 Subject: [PATCH 16/19] challenge02.md moved back to main --- First Folder/challenge02.md => challenge02.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename First Folder/challenge02.md => challenge02.md (100%) diff --git a/First Folder/challenge02.md b/challenge02.md similarity index 100% rename from First Folder/challenge02.md rename to challenge02.md From 16575ffa0aa04787eee2ca391c50b9508d1d67da Mon Sep 17 00:00:00 2001 From: MashtiK Date: Sat, 13 Dec 2025 04:33:21 +0100 Subject: [PATCH 17/19] creat a folder for logs --- logs/log01.log | 1 + logs/log02.log | 0 2 files changed, 1 insertion(+) create mode 100644 logs/log01.log create mode 100644 logs/log02.log diff --git a/logs/log01.log b/logs/log01.log new file mode 100644 index 00000000..6ab38c85 --- /dev/null +++ b/logs/log01.log @@ -0,0 +1 @@ +.log diff --git a/logs/log02.log b/logs/log02.log new file mode 100644 index 00000000..e69de29b From 6b78de26f817fcbb85a2273f9e4e18ad6dd13535 Mon Sep 17 00:00:00 2001 From: MashtiK Date: Sat, 13 Dec 2025 05:06:51 +0100 Subject: [PATCH 18/19] Modify challenge01.md to introduce merge conflict Added a line to create a merge conflict. --- challenge01.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/challenge01.md b/challenge01.md index 435e67f9..4097dd39 100644 --- a/challenge01.md +++ b/challenge01.md @@ -1,2 +1,3 @@ this is my first file to push to repo -test gui \ No newline at end of file +test gui +I creat a change for seeing the merge conflict From 730fba9a933dc2b901af4e61519028eb0115cdea Mon Sep 17 00:00:00 2001 From: MashtiK Date: Sat, 13 Dec 2025 05:17:28 +0100 Subject: [PATCH 19/19] creates joke.md --- 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..990012f9 --- /dev/null +++ b/joke.md @@ -0,0 +1 @@ +Tootooneshoon arrosi mishe