From 6cf4edd521b16ee01c72deac18e0dc8d5f211f48 Mon Sep 17 00:00:00 2001 From: Fulfinsen Date: Mon, 9 Feb 2026 12:14:18 +0200 Subject: [PATCH 01/21] 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 000000000..87cda3d85 --- /dev/null +++ b/example.md @@ -0,0 +1 @@ +If you see this, you are gay \ No newline at end of file From 9b5f84bf9b130c0449f7d38e09a9bc966660b5f4 Mon Sep 17 00:00:00 2001 From: Fulfinsen <110255604+Fulfinsen@users.noreply.github.com> Date: Mon, 9 Feb 2026 12:16:22 +0200 Subject: [PATCH 02/21] Add content to exmaple2.md --- exmaple2.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 exmaple2.md diff --git a/exmaple2.md b/exmaple2.md new file mode 100644 index 000000000..9fea379e0 --- /dev/null +++ b/exmaple2.md @@ -0,0 +1 @@ +If you see this, you are not gay From 156e7ec2a0608e7ff5fff78c4cca588bb45a42fb Mon Sep 17 00:00:00 2001 From: Fulfinsen Date: Mon, 9 Feb 2026 16:07:17 +0200 Subject: [PATCH 03/21] exmaple moved to folder1 --- example.md => Folder1/example.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename example.md => Folder1/example.md (100%) diff --git a/example.md b/Folder1/example.md similarity index 100% rename from example.md rename to Folder1/example.md From c60fb276a34dea42ca5ad86eaf84ce2c9f5c03a2 Mon Sep 17 00:00:00 2001 From: Fulfinsen Date: Mon, 9 Feb 2026 16:08:19 +0200 Subject: [PATCH 04/21] folder2 added --- Folder2/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Folder2/.gitkeep diff --git a/Folder2/.gitkeep b/Folder2/.gitkeep new file mode 100644 index 000000000..e69de29bb From eefd269437f55412bf7988a827638a4060295d79 Mon Sep 17 00:00:00 2001 From: Fulfinsen Date: Mon, 9 Feb 2026 16:18:48 +0200 Subject: [PATCH 05/21] Revert "exmaple moved to folder1" This reverts commit 156e7ec2a0608e7ff5fff78c4cca588bb45a42fb. --- Folder1/example.md => example.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Folder1/example.md => example.md (100%) diff --git a/Folder1/example.md b/example.md similarity index 100% rename from Folder1/example.md rename to example.md From 716269e48dba228938d0407a46c5f5a91b71a4a9 Mon Sep 17 00:00:00 2001 From: Fulfinsen Date: Mon, 9 Feb 2026 16:23:36 +0200 Subject: [PATCH 06/21] Commited through GUI VS Code --- Folder1/example.md | 2 ++ exmaple2.md | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 Folder1/example.md diff --git a/Folder1/example.md b/Folder1/example.md new file mode 100644 index 000000000..4aa2f3df2 --- /dev/null +++ b/Folder1/example.md @@ -0,0 +1,2 @@ +If you see this, you are gay +Another line, another "if you see this..." diff --git a/exmaple2.md b/exmaple2.md index 9fea379e0..a96532452 100644 --- a/exmaple2.md +++ b/exmaple2.md @@ -1 +1,3 @@ If you see this, you are not gay + +Yay From 8f9fc08aec1c47975ee5fda942331764bfc4113d Mon Sep 17 00:00:00 2001 From: Fulfinsen Date: Mon, 9 Feb 2026 16:26:20 +0200 Subject: [PATCH 07/21] challenge 2 - make a change and revert --- 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..70aa14375 --- /dev/null +++ b/challenge2.md @@ -0,0 +1 @@ +this is a new line \ No newline at end of file From 1aca979e1cf83168540f22965a036dcc6aeed4c8 Mon Sep 17 00:00:00 2001 From: Fulfinsen Date: Mon, 9 Feb 2026 16:29:26 +0200 Subject: [PATCH 08/21] challenge deleted --- challenge2.md | 1 - 1 file changed, 1 deletion(-) delete mode 100644 challenge2.md diff --git a/challenge2.md b/challenge2.md deleted file mode 100644 index 70aa14375..000000000 --- a/challenge2.md +++ /dev/null @@ -1 +0,0 @@ -this is a new line \ No newline at end of file From dc6a70acd25c4471c13bd0ce328c49954077a9ae Mon Sep 17 00:00:00 2001 From: Fulfinsen Date: Mon, 9 Feb 2026 16:29:52 +0200 Subject: [PATCH 09/21] exmaple deleted --- example.md | 1 - 1 file changed, 1 deletion(-) delete mode 100644 example.md diff --git a/example.md b/example.md deleted file mode 100644 index 87cda3d85..000000000 --- a/example.md +++ /dev/null @@ -1 +0,0 @@ -If you see this, you are gay \ No newline at end of file From 3b14818b51c48687ed7b846fbd62beec91d65c10 Mon Sep 17 00:00:00 2001 From: Fulfinsen Date: Mon, 9 Feb 2026 16:30:59 +0200 Subject: [PATCH 10/21] first commit --- challenge.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 challenge.md diff --git a/challenge.md b/challenge.md new file mode 100644 index 000000000..0e90bc776 --- /dev/null +++ b/challenge.md @@ -0,0 +1 @@ +This is a challenge From 0e93323dd5384ea07d87b01da8901177a080efec Mon Sep 17 00:00:00 2001 From: Fulfinsen Date: Mon, 9 Feb 2026 16:31:15 +0200 Subject: [PATCH 11/21] second commit --- challenge.md | 1 + 1 file changed, 1 insertion(+) diff --git a/challenge.md b/challenge.md index 0e90bc776..297c00606 100644 --- a/challenge.md +++ b/challenge.md @@ -1 +1,2 @@ This is a challenge +This is another file From 5d3fc20acb6da7552d47ada3f2d8890aaf820397 Mon Sep 17 00:00:00 2001 From: Fulfinsen Date: Mon, 9 Feb 2026 16:31:51 +0200 Subject: [PATCH 12/21] moved the file into a folder --- challenge.md => Folder1/challenge.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename challenge.md => Folder1/challenge.md (100%) diff --git a/challenge.md b/Folder1/challenge.md similarity index 100% rename from challenge.md rename to Folder1/challenge.md From effab6be72f4da6bb9eb31d677c70d8a5cc22194 Mon Sep 17 00:00:00 2001 From: Fulfinsen Date: Mon, 9 Feb 2026 16:32:30 +0200 Subject: [PATCH 13/21] Revert "moved the file into a folder" This reverts commit 5d3fc20acb6da7552d47ada3f2d8890aaf820397. --- Folder1/challenge.md => challenge.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Folder1/challenge.md => challenge.md (100%) diff --git a/Folder1/challenge.md b/challenge.md similarity index 100% rename from Folder1/challenge.md rename to challenge.md From 0ab753166f304320bf18aa5e5674d7993d085bef Mon Sep 17 00:00:00 2001 From: Fulfinsen Date: Mon, 9 Feb 2026 16:43:35 +0200 Subject: [PATCH 14/21] added a gitignore condition --- .gitignore | 3 +++ .vscode/settings.json | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4b64bc3c5..bb802b95f 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,6 @@ node_modules .tmp npm-debug.log + +log2.log +Folder2/*.log diff --git a/.vscode/settings.json b/.vscode/settings.json index 085cbeabc..14851ab5b 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 a5d4c397ade0d30f8f4070e8da2e016b49c113e6 Mon Sep 17 00:00:00 2001 From: Fulfinsen Date: Mon, 9 Feb 2026 16:46:58 +0200 Subject: [PATCH 15/21] commiting 2 log files --- .gitignore | 2 -- logs/log1.log | 0 logs/log2.log | 0 3 files changed, 2 deletions(-) create mode 100644 logs/log1.log create mode 100644 logs/log2.log diff --git a/.gitignore b/.gitignore index bb802b95f..61ecb76fe 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,4 @@ node_modules .tmp npm-debug.log - -log2.log Folder2/*.log diff --git a/logs/log1.log b/logs/log1.log new file mode 100644 index 000000000..e69de29bb diff --git a/logs/log2.log b/logs/log2.log new file mode 100644 index 000000000..e69de29bb From 257f867d2ac659e4b856c96c0b1824ab4a9c5293 Mon Sep 17 00:00:00 2001 From: Fulfinsen Date: Mon, 9 Feb 2026 16:56:29 +0200 Subject: [PATCH 16/21] Added gitStatusDemo.md The dev created this folder for demonstration purposes on git commit messages. No code was modified --- 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..bbf285056 --- /dev/null +++ b/gitStatusDemo.md @@ -0,0 +1 @@ +This is a new line, specifically for LinkedIn Learning! \ No newline at end of file From 48fdc54b003a8d7fb7012b4895ca24f655b1d5cc Mon Sep 17 00:00:00 2001 From: Fulfinsen <110255604+Fulfinsen@users.noreply.github.com> Date: Mon, 9 Feb 2026 17:02:15 +0200 Subject: [PATCH 17/21] Update gitStatusDemo.md --- gitStatusDemo.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitStatusDemo.md b/gitStatusDemo.md index bbf285056..5c3b9a8e7 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, specifically for LinkedIn Learning! This is a change From 02f5eafcb1a23c601f6d892f81e3d3582699552c Mon Sep 17 00:00:00 2001 From: Fulfinsen Date: Mon, 9 Feb 2026 17:02:53 +0200 Subject: [PATCH 18/21] Merge conflict example --- 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..b86b77018 --- /dev/null +++ b/gitStatusDemo.md @@ -0,0 +1 @@ +This is a new line, specifically for LinkedIn Learning! This is another change From 155108703adf338ed567bb3d6726f143cd32ea15 Mon Sep 17 00:00:00 2001 From: Fulfinsen Date: Mon, 9 Feb 2026 17:05:47 +0200 Subject: [PATCH 19/21] Merge conflict --- gitStatusDemo.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/gitStatusDemo.md b/gitStatusDemo.md index 2b27d4e58..b86b77018 100644 --- a/gitStatusDemo.md +++ b/gitStatusDemo.md @@ -1,5 +1 @@ -<<<<<<< HEAD This is a new line, specifically for LinkedIn Learning! This is another change -======= -This is a new line, specifically for LinkedIn Learning! This is a change ->>>>>>> 48fdc54b003a8d7fb7012b4895ca24f655b1d5cc From dedafe87dd2c6a7b27cfa048c2362ed51d31498d Mon Sep 17 00:00:00 2001 From: Fulfinsen Date: Mon, 9 Feb 2026 17:08:46 +0200 Subject: [PATCH 20/21] Challenge 3: create a branch and a pull request --- gitStatusDemo.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitStatusDemo.md b/gitStatusDemo.md index b86b77018..b238d2776 100644 --- a/gitStatusDemo.md +++ b/gitStatusDemo.md @@ -1 +1 @@ -This is a new line, specifically for LinkedIn Learning! This is another change +Your mom's gay \ No newline at end of file From 5246f9776c61f3051b94970e1227780cb8bb80b1 Mon Sep 17 00:00:00 2001 From: Fulfinsen Date: Mon, 9 Feb 2026 17:15:15 +0200 Subject: [PATCH 21/21] Challenge3: create a branch and a pull request --- gitStatusDemo.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitStatusDemo.md b/gitStatusDemo.md index b86b77018..2c1216e08 100644 --- a/gitStatusDemo.md +++ b/gitStatusDemo.md @@ -1 +1 @@ -This is a new line, specifically for LinkedIn Learning! This is another change +This is a new modified line, made in the branch \ No newline at end of file