From fa679328616ddfa4734b8e41f74d260b62a93ac4 Mon Sep 17 00:00:00 2001 From: martijnooo Date: Wed, 22 Jan 2025 16:54:30 +0100 Subject: [PATCH 1/4] Only a small adjustment --- your-code/about-me.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/your-code/about-me.md b/your-code/about-me.md index 31b9128..0c9755a 100644 --- a/your-code/about-me.md +++ b/your-code/about-me.md @@ -1,5 +1,5 @@ -# Who am I +# Who am I -> This is just a small change * I was born in Venezuela but moved to Algarve when I was 13. * I have a PhD in Neuroscience but have no intention of staying in academia. From 64ba8ca13a13c4b2edc6f9e296eb3d1259f281e7 Mon Sep 17 00:00:00 2001 From: martijnooo Date: Fri, 24 Jan 2025 14:23:20 +0100 Subject: [PATCH 2/4] This is the default file for testing conflicts --- your-code/about-me_v2.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 your-code/about-me_v2.md diff --git a/your-code/about-me_v2.md b/your-code/about-me_v2.md new file mode 100644 index 0000000..08c1366 --- /dev/null +++ b/your-code/about-me_v2.md @@ -0,0 +1 @@ +This is a test file for testing conflicts. \ No newline at end of file From 5873fd34ce84f04e9e67e837a2b6835b8c21243a Mon Sep 17 00:00:00 2001 From: martijnooo Date: Fri, 24 Jan 2025 14:24:23 +0100 Subject: [PATCH 3/4] First change to test file --- your-code/about-me_v2.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/your-code/about-me_v2.md b/your-code/about-me_v2.md index 08c1366..22d1d47 100644 --- a/your-code/about-me_v2.md +++ b/your-code/about-me_v2.md @@ -1 +1,3 @@ -This is a test file for testing conflicts. \ No newline at end of file +This is a test file for testing conflicts. + +Now i want to test what happens when i create diverging changes \ No newline at end of file From e42f3bfdec3d49adc4d7738fada9245ca573fa54 Mon Sep 17 00:00:00 2001 From: martijnooo Date: Fri, 24 Jan 2025 14:28:24 +0100 Subject: [PATCH 4/4] This is a file with different changes to create conflicts --- your-code/about-me_v2.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/your-code/about-me_v2.md b/your-code/about-me_v2.md index 08c1366..d4ffb2b 100644 --- a/your-code/about-me_v2.md +++ b/your-code/about-me_v2.md @@ -1 +1,3 @@ -This is a test file for testing conflicts. \ No newline at end of file +This is a test file for testing conflicts. + +What happens when i make different changes on a different file? \ No newline at end of file