From bb6171384b19d52a9c5125cbb2c609e3e21adbd2 Mon Sep 17 00:00:00 2001 From: Jayam Patel Date: Mon, 27 Apr 2026 13:06:24 +0530 Subject: [PATCH 1/8] Add conflict_test.txt --- conflict_test.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 conflict_test.txt diff --git a/conflict_test.txt b/conflict_test.txt new file mode 100644 index 0000000000000..bb76875ffcda2 --- /dev/null +++ b/conflict_test.txt @@ -0,0 +1 @@ +Initial Content From d7ac75be6a8940bb0db8a909bfc4f82d37088c2a Mon Sep 17 00:00:00 2001 From: Jayam Patel Date: Mon, 27 Apr 2026 13:06:37 +0530 Subject: [PATCH 2/8] Conflict change from develop 1 --- conflict_test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conflict_test.txt b/conflict_test.txt index bb76875ffcda2..1d67c2fab8539 100644 --- a/conflict_test.txt +++ b/conflict_test.txt @@ -1 +1 @@ -Initial Content +Develop change 1 From e54964cf89b66344898de1eafa89d7004410cff7 Mon Sep 17 00:00:00 2001 From: Jayam Patel Date: Mon, 27 Apr 2026 13:06:38 +0530 Subject: [PATCH 3/8] Conflict change from develop 2 --- conflict_test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conflict_test.txt b/conflict_test.txt index 1d67c2fab8539..c23d4c2fcdc87 100644 --- a/conflict_test.txt +++ b/conflict_test.txt @@ -1 +1 @@ -Develop change 1 +Develop change 2 From 635cd71ef4a5c89c78e59ca60f22376f19311e9f Mon Sep 17 00:00:00 2001 From: Jayam Patel Date: Mon, 27 Apr 2026 13:06:39 +0530 Subject: [PATCH 4/8] Conflict change from develop 3 --- conflict_test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conflict_test.txt b/conflict_test.txt index c23d4c2fcdc87..af077e66c5a49 100644 --- a/conflict_test.txt +++ b/conflict_test.txt @@ -1 +1 @@ -Develop change 2 +Develop change 3 From 0776955f68f3d5302859b0e21a5d59d5d16b02a1 Mon Sep 17 00:00:00 2001 From: Jayam Patel Date: Mon, 27 Apr 2026 13:06:39 +0530 Subject: [PATCH 5/8] Conflict change from branch 3 --- conflict_test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conflict_test.txt b/conflict_test.txt index c23d4c2fcdc87..da000525ae416 100644 --- a/conflict_test.txt +++ b/conflict_test.txt @@ -1 +1 @@ -Develop change 2 +Branch 3 change From 89173aca5d5a59d8c390c123f45ce31e3a1e5d27 Mon Sep 17 00:00:00 2001 From: Jayam Patel Date: Mon, 27 Apr 2026 13:06:40 +0530 Subject: [PATCH 6/8] Conflict change from develop 4 --- conflict_test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conflict_test.txt b/conflict_test.txt index af077e66c5a49..a572143909f16 100644 --- a/conflict_test.txt +++ b/conflict_test.txt @@ -1 +1 @@ -Develop change 3 +Develop change 4 From 4d1f9abc9121b3c7092f44cdad2a30c4dfeadea3 Mon Sep 17 00:00:00 2001 From: Jayam Patel Date: Mon, 27 Apr 2026 13:06:41 +0530 Subject: [PATCH 7/8] Conflict change from develop 5 --- conflict_test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conflict_test.txt b/conflict_test.txt index a572143909f16..2f7d99e0a8a14 100644 --- a/conflict_test.txt +++ b/conflict_test.txt @@ -1 +1 @@ -Develop change 4 +Develop change 5 From d67fdacd5c0960fc7ca39194ebb1d68efdb34ddb Mon Sep 17 00:00:00 2001 From: Jayam Patel Date: Mon, 27 Apr 2026 13:06:43 +0530 Subject: [PATCH 8/8] Conflict change from develop 6 --- conflict_test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conflict_test.txt b/conflict_test.txt index 2f7d99e0a8a14..577cee09bd3f4 100644 --- a/conflict_test.txt +++ b/conflict_test.txt @@ -1 +1 @@ -Develop change 5 +Develop change 6