From 3224f75818d1b45d1cd13d7200556671e603a8fe Mon Sep 17 00:00:00 2001 From: Hoang Date: Wed, 26 Nov 2025 09:13:12 +0700 Subject: [PATCH 01/21] 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 00000000..954517c8 --- /dev/null +++ b/example.md @@ -0,0 +1 @@ +This is content \ No newline at end of file From aa0413fe42798eb66d4099656b6ecad42409cf38 Mon Sep 17 00:00:00 2001 From: nkhplus Date: Wed, 26 Nov 2025 09:25:52 +0700 Subject: [PATCH 02/21] Add example content to 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 00000000..85d8d11b --- /dev/null +++ b/example02.md @@ -0,0 +1 @@ +This is the example of example02.md From bbbdaebfd38cb1a89d370fa111080ca96841327d Mon Sep 17 00:00:00 2001 From: Hoang Date: Wed, 26 Nov 2025 09:47:57 +0700 Subject: [PATCH 03/21] This challenge 01.md --- 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..ff251e29 --- /dev/null +++ b/Challenge01.md @@ -0,0 +1 @@ +This challenge 01 which I will push this markdonw to the remote \ No newline at end of file From f536ac3b8141619ed6e1660b111532096a3df604 Mon Sep 17 00:00:00 2001 From: Hoang Date: Fri, 28 Nov 2025 08:42:41 +0700 Subject: [PATCH 04/21] Add an extra line to show git tracks changes --- example.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/example.md b/example.md index 954517c8..a5580a39 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 3885454d9c107044fbfe6f2727f6de5c718c9cee Mon Sep 17 00:00:00 2001 From: Hoang Date: Fri, 28 Nov 2025 08:48:19 +0700 Subject: [PATCH 05/21] Add demo --- example.md | 5 ++++- example02.md | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/example.md b/example.md index a5580a39..0ada6774 100644 --- a/example.md +++ b/example.md @@ -1,3 +1,6 @@ This is content -This is an extra line \ No newline at end of file +This is an extra line + + +An another small change \ No newline at end of file diff --git a/example02.md b/example02.md index 85d8d11b..3768a615 100644 --- a/example02.md +++ b/example02.md @@ -1 +1 @@ -This is the example of example02.md +This is the example of example02.md! From bf4b48cf76534fc5ab76cfdb17831feb31d70298 Mon Sep 17 00:00:00 2001 From: Hoang Date: Fri, 28 Nov 2025 08:50:30 +0700 Subject: [PATCH 06/21] 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 3768a615..00000000 --- a/example02.md +++ /dev/null @@ -1 +0,0 @@ -This is the example of example02.md! From 203d74a6cc412d180b646595e11564979f426dfb Mon Sep 17 00:00:00 2001 From: Hoang Date: Fri, 28 Nov 2025 08:58:07 +0700 Subject: [PATCH 07/21] 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 2c682da33572d322503bc454355e53d6709db4ee Mon Sep 17 00:00:00 2001 From: Hoang Date: Fri, 28 Nov 2025 09:00:46 +0700 Subject: [PATCH 08/21] rename Challenge01.md to NewChallenge --- Challenge01.md => NewChallenge.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Challenge01.md => NewChallenge.md (100%) diff --git a/Challenge01.md b/NewChallenge.md similarity index 100% rename from Challenge01.md rename to NewChallenge.md From f77b278aa6f1fcb7582b926b56a67d04d1fdc12c Mon Sep 17 00:00:00 2001 From: Hoang Date: Fri, 28 Nov 2025 09:04:59 +0700 Subject: [PATCH 09/21] Move 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 49edb562d205d7e4b1bf14cfee79c2ff1a77c0aa Mon Sep 17 00:00:00 2001 From: Hoang Date: Fri, 28 Nov 2025 09:08:37 +0700 Subject: [PATCH 10/21] 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 6d3847a69a54ef9b55a257552cdcf2912e31cc17 Mon Sep 17 00:00:00 2001 From: Hoang Date: Fri, 28 Nov 2025 09:44:22 +0700 Subject: [PATCH 11/21] Revert "rename Challenge01.md to NewChallenge" This reverts commit 2c682da33572d322503bc454355e53d6709db4ee. --- Challenge01.md | 3 +++ NewChallenge.md | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 Challenge01.md delete mode 100644 NewChallenge.md diff --git a/Challenge01.md b/Challenge01.md new file mode 100644 index 00000000..0919643c --- /dev/null +++ b/Challenge01.md @@ -0,0 +1,3 @@ +This challenge 01 which I will push this markdonw to the remote + +And the line \ No newline at end of file diff --git a/NewChallenge.md b/NewChallenge.md deleted file mode 100644 index ff251e29..00000000 --- a/NewChallenge.md +++ /dev/null @@ -1 +0,0 @@ -This challenge 01 which I will push this markdonw to the remote \ No newline at end of file From aa77318fd3709968f477773f8593da761c28cb7c Mon Sep 17 00:00:00 2001 From: Hoang Date: Fri, 28 Nov 2025 09:51:33 +0700 Subject: [PATCH 12/21] Add NewName --- First_Folder/NewName.md | 1 - 1 file changed, 1 deletion(-) diff --git a/First_Folder/NewName.md b/First_Folder/NewName.md index 0ada6774..ac08876d 100644 --- a/First_Folder/NewName.md +++ b/First_Folder/NewName.md @@ -3,4 +3,3 @@ This is content This is an extra line -An another small change \ No newline at end of file From 70af9bc20ee9c77db46e719209b12bb9d82344f5 Mon Sep 17 00:00:00 2001 From: Hoang Date: Fri, 28 Nov 2025 09:54:41 +0700 Subject: [PATCH 13/21] Add a file --- Make and revert.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 Make and revert.md diff --git a/Make and revert.md b/Make and revert.md new file mode 100644 index 00000000..1c38d834 --- /dev/null +++ b/Make and revert.md @@ -0,0 +1 @@ +Make file and revert it \ No newline at end of file From c2fad7a578be3b83afdbf7edfb06193ce90352c2 Mon Sep 17 00:00:00 2001 From: Hoang Date: Fri, 28 Nov 2025 09:55:30 +0700 Subject: [PATCH 14/21] Add extra line --- Make and revert.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Make and revert.md b/Make and revert.md index 1c38d834..f189075d 100644 --- a/Make and revert.md +++ b/Make and revert.md @@ -1 +1,3 @@ -Make file and revert it \ No newline at end of file +Make file and revert it + +Add another extra line \ No newline at end of file From 44232faff189e27c82db9a47f59f608dc3512973 Mon Sep 17 00:00:00 2001 From: Hoang Date: Fri, 28 Nov 2025 09:56:28 +0700 Subject: [PATCH 15/21] Move Make and Revert.md to First_Folder --- Make and revert.md => First_Folder/Make and revert.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Make and revert.md => First_Folder/Make and revert.md (100%) diff --git a/Make and revert.md b/First_Folder/Make and revert.md similarity index 100% rename from Make and revert.md rename to First_Folder/Make and revert.md From aa8485855b94d256da22e6f6e90091090daf5f32 Mon Sep 17 00:00:00 2001 From: Hoang Date: Fri, 28 Nov 2025 10:00:06 +0700 Subject: [PATCH 16/21] revert make and revert.md --- First_Folder/Make and revert.md => Make and revert.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename First_Folder/Make and revert.md => Make and revert.md (100%) diff --git a/First_Folder/Make and revert.md b/Make and revert.md similarity index 100% rename from First_Folder/Make and revert.md rename to Make and revert.md From 9e497aa5976b9ce11e77603b2fd548a9674d7112 Mon Sep 17 00:00:00 2001 From: Hoang Date: Wed, 3 Dec 2025 09:10:34 +0700 Subject: [PATCH 17/21] xx --- .gitignore | 4 ++++ .vscode/settings.json | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4b64bc3c..68c5b514 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 diff --git a/.vscode/settings.json b/.vscode/settings.json index 085cbeab..14851ab5 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -20,7 +20,7 @@ "workbench.colorTheme": "Visual Studio Dark", "workbench.fontAliasing": "antialiased", "workbench.statusBar.visible": true, - // "files.exclude": { - // "**/.git": false - // } + "files.exclude": { + "**/.git": false + } } \ No newline at end of file From f2992c0ef9661d8fd4b9847a8fe18a1a6b150ab9 Mon Sep 17 00:00:00 2001 From: Hoang Date: Wed, 3 Dec 2025 09:27:54 +0700 Subject: [PATCH 18/21] add gitStatusDemo.md --- 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 00000000..758cbbc3 --- /dev/null +++ b/gitStatusDemo.md @@ -0,0 +1 @@ +This is a new line, specifically for Linkedin Learning! \ No newline at end of file From c3398dc0a9316f7d1900830f55f70b090c4d4732 Mon Sep 17 00:00:00 2001 From: nkhplus Date: Wed, 3 Dec 2025 09:29:18 +0700 Subject: [PATCH 19/21] Update gitStatusDemo.md with merge test line Added a line to test the merge function of GitHub. --- gitStatusDemo.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gitStatusDemo.md b/gitStatusDemo.md index 758cbbc3..eef22475 100644 --- a/gitStatusDemo.md +++ b/gitStatusDemo.md @@ -1 +1,3 @@ -This is a new line, specifically for Linkedin Learning! \ No newline at end of file +This is a new line, specifically for Linkedin Learning! + +I want to test the merge function of githug From 3024384deb0eda3693731bc9c39ee30e50e134ff Mon Sep 17 00:00:00 2001 From: Hoang Date: Wed, 3 Dec 2025 09:30:10 +0700 Subject: [PATCH 20/21] add a change to create a merge confict --- gitStatusDemo.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitStatusDemo.md b/gitStatusDemo.md index 758cbbc3..d126a80d 100644 --- a/gitStatusDemo.md +++ b/gitStatusDemo.md @@ -1 +1 @@ -This is a new line, specifically for Linkedin Learning! \ No newline at end of file +This is a new line, this is a better change! \ No newline at end of file From 149a8722207f5cf86cffeea377e35ff5447d301e Mon Sep 17 00:00:00 2001 From: Hoang Date: Wed, 3 Dec 2025 09:38:03 +0700 Subject: [PATCH 21/21] challeng 02 --- challenge_02.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 challenge_02.md diff --git a/challenge_02.md b/challenge_02.md new file mode 100644 index 00000000..5087022d --- /dev/null +++ b/challenge_02.md @@ -0,0 +1,2 @@ +a joke +this is a branch \ No newline at end of file