From 70f6cc8c55c5d2d0066a0071fb9127c14b7c6e30 Mon Sep 17 00:00:00 2001 From: Sebastian Rudawski Date: Mon, 29 Mar 2021 11:33:56 +0100 Subject: [PATCH 01/12] Added a test file --- test.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 test.txt diff --git a/test.txt b/test.txt new file mode 100644 index 000000000..84362ca04 --- /dev/null +++ b/test.txt @@ -0,0 +1 @@ +Test file \ No newline at end of file From 76604c4ca2cfcf8a126c8e8bf82c0120938141c9 Mon Sep 17 00:00:00 2001 From: cortex-pg Date: Thu, 1 Apr 2021 08:13:26 +0100 Subject: [PATCH 02/12] Update test.txt Added line modification to cause a merge conflict with another editor for documentation purposes. --- test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.txt b/test.txt index 84362ca04..ae2cf224f 100644 --- a/test.txt +++ b/test.txt @@ -1 +1 @@ -Test file \ No newline at end of file +Test file, modified by editor 1 From 61afc1ddcbc5b4f2767419165388ada4a1b16750 Mon Sep 17 00:00:00 2001 From: Sebastian Rudawski Date: Thu, 1 Apr 2021 08:29:21 +0100 Subject: [PATCH 03/12] Temporary change --- test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.txt b/test.txt index ae2cf224f..84362ca04 100644 --- a/test.txt +++ b/test.txt @@ -1 +1 @@ -Test file, modified by editor 1 +Test file \ No newline at end of file From 2a27684eae53b9c2d46b40173600492c52ee0ff6 Mon Sep 17 00:00:00 2001 From: cortex-pg Date: Thu, 1 Apr 2021 08:36:28 +0100 Subject: [PATCH 04/12] Update test.txt Added text to cause a conflict for documentation purposes --- test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.txt b/test.txt index 84362ca04..cb799260a 100644 --- a/test.txt +++ b/test.txt @@ -1 +1 @@ -Test file \ No newline at end of file +Test file, modified by editor two. From 379c937f6d6f8dde99a50f1222e5133ab4d21aae Mon Sep 17 00:00:00 2001 From: cortex-pg Date: Thu, 1 Apr 2021 10:52:12 +0100 Subject: [PATCH 05/12] Update test.txt Causing merge conflict for documentation purposes --- test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.txt b/test.txt index cb799260a..1a6800c1d 100644 --- a/test.txt +++ b/test.txt @@ -1 +1 @@ -Test file, modified by editor two. +Test file, modified by editor two . From e23be2157c3810daa9b7e559bf1e6f729afbce75 Mon Sep 17 00:00:00 2001 From: cortex-pg Date: Thu, 1 Apr 2021 11:27:32 +0100 Subject: [PATCH 06/12] Update test.txt --- test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.txt b/test.txt index 1a6800c1d..cb799260a 100644 --- a/test.txt +++ b/test.txt @@ -1 +1 @@ -Test file, modified by editor two . +Test file, modified by editor two. From 4b2bd3a35ec209cb6a59be630184763d7ffbe825 Mon Sep 17 00:00:00 2001 From: Sebastian Rudawski Date: Thu, 1 Apr 2021 11:39:16 +0100 Subject: [PATCH 07/12] Test commit to force merge conflict --- test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.txt b/test.txt index cb799260a..ee3c965db 100644 --- a/test.txt +++ b/test.txt @@ -1 +1 @@ -Test file, modified by editor two. +Test file, modified by editor one . From 6075eb2b87c2fbd05979895df7927549c622dbe5 Mon Sep 17 00:00:00 2001 From: cortex-pg Date: Thu, 1 Apr 2021 11:41:22 +0100 Subject: [PATCH 08/12] Update test.txt --- test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.txt b/test.txt index ee3c965db..cb799260a 100644 --- a/test.txt +++ b/test.txt @@ -1 +1 @@ -Test file, modified by editor one . +Test file, modified by editor two. From 8a5a68aa7553c17f056ae9cb37ae0ebacd4566bd Mon Sep 17 00:00:00 2001 From: cortex-pg Date: Wed, 7 Apr 2021 11:18:37 +0100 Subject: [PATCH 09/12] Update test.txt Test commit to cause a conflict for documentation purposes --- test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.txt b/test.txt index cb799260a..e243a2f2b 100644 --- a/test.txt +++ b/test.txt @@ -1 +1 @@ -Test file, modified by editor two. +Test file, modified by editor A. From ee03de6ecbf11bd6340072de48df775ed41b687d Mon Sep 17 00:00:00 2001 From: Sebastian Rudawski Date: Wed, 7 Apr 2021 11:19:50 +0100 Subject: [PATCH 10/12] Change to cause a merge conflict for documentation purposes --- test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.txt b/test.txt index cb799260a..bd15c10b4 100644 --- a/test.txt +++ b/test.txt @@ -1 +1 @@ -Test file, modified by editor two. +Test file, modified by editor B. From e4ea5aa64a11d3507d47ddee7194f6aada3b09f4 Mon Sep 17 00:00:00 2001 From: cortex-pg Date: Wed, 7 Apr 2021 13:31:33 +0100 Subject: [PATCH 11/12] Update test.txt Commit to cause a merge conflict for documentation purposes --- test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.txt b/test.txt index bd15c10b4..f218aa0d1 100644 --- a/test.txt +++ b/test.txt @@ -1 +1 @@ -Test file, modified by editor B. +Test file, modified by editor TWO. From 74c7d266f3b6ba1ae79c58f7876426d0005bc90b Mon Sep 17 00:00:00 2001 From: Sebastian Rudawski Date: Wed, 7 Apr 2021 13:38:09 +0100 Subject: [PATCH 12/12] Commit to cause a merge conflict for documentation purposes --- test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.txt b/test.txt index bd15c10b4..59e59ecdb 100644 --- a/test.txt +++ b/test.txt @@ -1 +1 @@ -Test file, modified by editor B. +Test file, modified by editor ONE.